Changeset 427 for vendor/current/source3/passdb/passdb.c

Timestamp:

Apr 9, 2010, 3:20:58 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5.x: update to 3.5.2

File:

• vendor/current/source3/passdb/passdb.c (modified) (3 diffs)

vendor/current/source3/passdb/passdb.c

@@ -123 +123 @@
 }
 
+static int count_commas(const char *str)
+{
+        int num_commas = 0;
+        const char *comma = str;
+
+        while ((comma = strchr(comma, ',')) != NULL) {
+                comma += 1;
+                num_commas += 1;
+        }
+        return num_commas;
+}
+
 /*********************************************************************
  Initialize a struct samu from a struct passwd including the user 
@@ -133 +145 @@
         const char *guest_account = lp_guestaccount();
         const char *domain = global_myname();
+        char *fullname;
         uint32 urid;
 
@@ -142 +155 @@
 
         pdb_set_username(user, pwd->pw_name, PDB_SET);
-        pdb_set_fullname(user, pwd->pw_gecos, PDB_SET);
+
+        fullname = NULL;
+
+        if (count_commas(pwd->pw_gecos) == 3) {
+                /*
+                 * Heuristic: This seems to be a gecos field that has been
+                 * edited by chfn(1). Only use the part before the first
+                 * comma. Fixes bug 5198.
+                 */
+                fullname = talloc_strndup(
+                        talloc_tos(), pwd->pw_gecos,
+                        strchr(pwd->pw_gecos, ',') - pwd->pw_gecos);
+        }
+
+        if (fullname != NULL) {
+                pdb_set_fullname(user, fullname, PDB_SET);
+        } else {
+                pdb_set_fullname(user, pwd->pw_gecos, PDB_SET);
+        }
+        TALLOC_FREE(fullname);
+
         pdb_set_domain (user, get_global_sam_name(), PDB_DEFAULT);
 #if 0