Changeset 232 for branches/samba-3.2.x/source/smbd/password.c

Timestamp:

May 27, 2009, 9:09:42 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.8

File:

• branches/samba-3.2.x/source/smbd/password.c (modified) (5 diffs)

branches/samba-3.2.x/source/smbd/password.c

@@ -28 +28 @@
 /* this holds info on user ids that are already validated for this VC */
 static user_struct *validated_users;
-static int next_vuid = VUID_OFFSET;
+static uint16_t next_vuid = VUID_OFFSET;
 static int num_validated_vuids;
 
@@ -150 +150 @@
 }
 
+static void increment_next_vuid(uint16_t *vuid)
+{
+        *vuid += 1;
+
+        /* Check for vuid wrap. */
+        if (*vuid == UID_FIELD_INVALID) {
+                *vuid = VUID_OFFSET;
+        }
+}
+
 /****************************************************
  Create a new partial auth user struct.
@@ -178 +188 @@
         while( get_valid_user_struct_internal(next_vuid,
                         SERVER_ALLOCATED_REQUIRED_ANY) != NULL ) {
-                next_vuid++;
-                /* Check for vuid wrap. */
-                if (next_vuid == UID_FIELD_INVALID) {
-                        next_vuid = VUID_OFFSET;
-                }
+                increment_next_vuid(&next_vuid);
         }
 
@@ -195 +201 @@
          * to NTLMSSP.
          */
-        next_vuid++;
+        increment_next_vuid(&next_vuid);
         num_validated_vuids++;
 
@@ -325 +331 @@
                 "and will be vuid %u\n",
                 (int)vuser->uid,vuser->user.unix_name, vuser->vuid));
-
-        next_vuid++;
-        num_validated_vuids++;
 
         if (!session_claim(vuser)) {