Changeset 988 for vendor/current/source3/lib/username.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/lib/username.c (modified) (6 diffs)

vendor/current/source3/lib/username.c

@@ -22 +22 @@
 #include "includes.h"
 #include "system/passwd.h"
-#include "memcache.h"
+#include "../lib/util/memcache.h"
 #include "../lib/util/util_pw.h"
 
@@ -43 +43 @@
         }
 
-        pw = sys_getpwnam(name);
+        pw = getpwnam(name);
         if (pw == NULL) {
                 return NULL;
@@ -93 +93 @@
 
 /****************************************************************************
- * A wrapper for sys_getpwnam().  The following variations are tried:
+ * A wrapper for getpwnam().  The following variations are tried:
  *   - as transmitted
  *   - in all lower case if this differs from transmitted
  *   - in all upper case if this differs from transmitted
- *   - using lp_usernamelevel() for permutations.
+ *   - using lp_username_level() for permutations.
 ****************************************************************************/
 
@@ -113 +113 @@
         /* Try in all lower case first as this is the most 
            common case on UNIX systems */
-        strlower_m(user2);
+        if (!strlower_m(user2)) {
+                DEBUG(5,("strlower_m %s failed\n", user2));
+                goto done;
+        }
+
         DEBUG(5,("Trying _Get_Pwnam(), username as lowercase is %s\n",user2));
         ret = getpwnam_alloc_cached(mem_ctx, user2);
@@ -129 +133 @@
 
         /* Try as uppercase, if username wasn't originally uppercase */
-        strupper_m(user2);
+        if (!strupper_m(user2)) {
+                goto done;
+        }
+
         if(strcmp(user, user2) != 0) {
                 DEBUG(5,("Trying _Get_Pwnam(), username as uppercase is %s\n",
@@ -139 +146 @@
 
         /* Try all combinations up to usernamelevel */
-        strlower_m(user2);
+        if (!strlower_m(user2)) {
+                DEBUG(5,("strlower_m %s failed\n", user2));
+                goto done;
+        }
         DEBUG(5,("Checking combinations of %d uppercase letters in %s\n",
-                 lp_usernamelevel(), user2));
+                 lp_username_level(), user2));
         ret = uname_string_combinations(user2, mem_ctx, getpwnam_alloc_cached,
-                                        lp_usernamelevel());
+                                        lp_username_level());
 
 done: