Changeset 594 for vendor/current/source3/passdb

Timestamp:

Jul 1, 2011, 4:02:23 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update vendor to version 3.5.8

Location:

vendor/current/source3/passdb

Files:

• pdb_interface.c (modified) (2 diffs)
• pdb_ldap.c (modified) (2 diffs)
• pdb_smbpasswd.c (modified) (1 diff)
• util_unixsids.c (modified) (1 diff)

vendor/current/source3/passdb/pdb_interface.c

@@ -255 +255 @@
         const char *guestname = lp_guestaccount();
 
-        if ( !(pwd = getpwnam_alloc(talloc_autofree_context(), guestname ) ) ) {
+        if ( !(pwd = Get_Pwnam_alloc(talloc_autofree_context(), guestname ) ) ) {
                 DEBUG(0,("guest_user_info: Unable to locate guest account [%s]!\n", 
                         guestname));
@@ -1424 +1424 @@
            The primary group SID is only of real use to Windows clients */
 
-        if ( !(pw = getpwnam_alloc(mem_ctx, username)) ) {
+        if ( !(pw = Get_Pwnam_alloc(mem_ctx, username)) ) {
                 return NT_STATUS_NO_SUCH_USER;
         }

vendor/current/source3/passdb/pdb_ldap.c

@@ -4485 +4485 @@
 
  retry:
-        if (state->current_entry == NULL) {
-                return false;
-        }
-
         if ((state->entries == NULL) && (state->pagedresults_cookie == NULL))
                 return False;
@@ -4495 +4491 @@
             !ldapsam_search_nextpage(search))
                     return False;
+
+        if (state->current_entry == NULL) {
+                return false;
+        }
 
         result = state->ldap2displayentry(state, search,

vendor/current/source3/passdb/pdb_smbpasswd.c

@@ -1197 +1197 @@
                 /* If the user specified a RID, make sure its able to be both stored and retreived */
                 if (rid == DOMAIN_USER_RID_GUEST) {
-                        struct passwd *passwd = getpwnam_alloc(NULL, lp_guestaccount());
+                        struct passwd *passwd = Get_Pwnam_alloc(NULL, lp_guestaccount());
                         if (!passwd) {
                                 DEBUG(0, ("Could not find guest account via getpwnam()! (%s)\n", lp_guestaccount()));

vendor/current/source3/passdb/util_unixsids.c

@@ -57 +57 @@
         struct passwd *pwd;
 
-        pwd = getpwnam_alloc(talloc_autofree_context(), name);
+        pwd = Get_Pwnam_alloc(talloc_autofree_context(), name);
         if (pwd == NULL) {
                 return False;