Changeset 745 for trunk/server/source3/libnet/libnet_samsync_passdb.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/libnet/libnet_samsync_passdb.c (modified) (14 diffs)

trunk/server/source3/libnet/libnet_samsync_passdb.c

@@ -25 +25 @@
 
 #include "includes.h"
-#include "libnet/libnet.h"
+#include "system/passwd.h"
+#include "libnet/libnet_samsync.h"
+#include "../libcli/security/security.h"
+#include "passdb.h"
 
 /* Convert a struct samu_DELTA to a struct samu. */
@@ -179 +182 @@
                 pdb_sethexhours(newstr, r->logon_hours.bits);
                 if (!strequal(oldstr, newstr))
-                        pdb_set_hours(account, r->logon_hours.bits, PDB_CHANGED);
+                        pdb_set_hours(account, r->logon_hours.bits,
+                                      pdb_get_hours_len(account), PDB_CHANGED);
         }
 
@@ -300 +304 @@
         GROUP_MAP map;
         struct group *grp;
-        DOM_SID user_sid;
-        DOM_SID group_sid;
+         user_sid;
+         group_sid;
         struct passwd *passwd = NULL;
         fstring sid_string;
@@ -319 +323 @@
         }
 
-        sid_copy(&user_sid, get_global_sam_sid());
-        sid_append_rid(&user_sid, r->rid);
+        sid_compose(&user_sid, get_global_sam_sid(), r->rid);
 
         DEBUG(3, ("Attempting to find SID %s for user %s in the passdb\n",
@@ -387 +390 @@
         fstring comment;
         struct group *grp = NULL;
-        DOM_SID group_sid;
+         group_sid;
         fstring sid_string;
         GROUP_MAP map;
@@ -396 +399 @@
 
         /* add the group to the mapping table */
-        sid_copy(&group_sid, get_global_sam_sid());
-        sid_append_rid(&group_sid, rid);
+        sid_compose(&group_sid, get_global_sam_sid(), rid);
         sid_to_fstring(sid_string, &group_sid);
 
@@ -452 +454 @@
         char **nt_members = NULL;
         char **unix_members;
-        DOM_SID group_sid;
+         group_sid;
         GROUP_MAP map;
         struct group *grp;
@@ -460 +462 @@
         }
 
-        sid_copy(&group_sid, get_global_sam_sid());
-        sid_append_rid(&group_sid, rid);
+        sid_compose(&group_sid, get_global_sam_sid(), rid);
 
         if (!get_domain_group_from_sid(group_sid, &map)) {
@@ -486 +487 @@
         for (i=0; i < r->num_rids; i++) {
                 struct samu *member = NULL;
-                DOM_SID member_sid;
+                 member_sid;
 
                 if ( !(member = samu_new(mem_ctx)) ) {
@@ -492 +493 @@
                 }
 
-                sid_copy(&member_sid, get_global_sam_sid());
-                sid_append_rid(&member_sid, r->rids[i]);
+                sid_compose(&member_sid, get_global_sam_sid(), r->rids[i]);
 
                 if (!pdb_getsampwsid(member, &member_sid)) {
@@ -574 +574 @@
                                  uint32_t rid,
                                  struct netr_DELTA_ALIAS *r,
-                                 const DOM_SID *dom_sid)
+                                 const  *dom_sid)
 {
         fstring name;
         fstring comment;
         struct group *grp = NULL;
-        DOM_SID alias_sid;
+         alias_sid;
         fstring sid_string;
         GROUP_MAP map;
@@ -588 +588 @@
 
         /* Find out whether the group is already mapped */
-        sid_copy(&alias_sid, dom_sid);
-        sid_append_rid(&alias_sid, rid);
+        sid_compose(&alias_sid, dom_sid, rid);
         sid_to_fstring(sid_string, &alias_sid);
 
@@ -614 +613 @@
         map.sid = alias_sid;
 
-        if (sid_equal(dom_sid, &global_sid_Builtin))
+        if (sid_equal(dom_sid, &global_sid_Builtin))
                 map.sid_name_use = SID_NAME_WKN_GRP;
         else
@@ -636 +635 @@
                                 uint32_t rid,
                                 struct netr_DELTA_ALIAS_MEMBER *r,
-                                const DOM_SID *dom_sid)
+                                const  *dom_sid)
 {
         return NT_STATUS_OK;