Changeset 746 for vendor/current/source3/passdb

Timestamp:

Nov 27, 2012, 4:56:06 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated vendor to 3.6.9

Location:

vendor/current/source3/passdb

Files:

• lookup_sid.c (modified) (3 diffs)
• pdb_get_set.c (modified) (5 diffs)
• pdb_interface.c (modified) (1 diff)
• pdb_ldap.c (modified) (1 diff)
• proto.h (modified) (1 diff)

vendor/current/source3/passdb/lookup_sid.c

@@ -1438 +1438 @@
                 if (idmap_cache_find_sid2uid(&sids[i], &ids[i].id.uid,
                                              &expired)
-                    && !expired) {
+                    && !expired && ids[i].id.uid != (uid_t)-1) {
                         ids[i].type = WBC_ID_TYPE_UID;
                         continue;
@@ -1444 +1444 @@
                 if (idmap_cache_find_sid2gid(&sids[i], &ids[i].id.gid,
                                              &expired)
-                    && !expired) {
+                    && !expired && ids[i].id.gid != (gid_t)-1) {
                         ids[i].type = WBC_ID_TYPE_GID;
                         continue;
@@ -1491 +1491 @@
                 }
         }
+
 done:
+        for (i=0; i<num_sids; i++) {
+                switch(ids[i].type) {
+                case WBC_ID_TYPE_GID:
+                        if (ids[i].id.gid == (gid_t)-1) {
+                                ids[i].type = WBC_ID_TYPE_NOT_SPECIFIED;
+                        }
+                        break;
+                case WBC_ID_TYPE_UID:
+                        if (ids[i].id.uid == (uid_t)-1) {
+                                ids[i].type = WBC_ID_TYPE_NOT_SPECIFIED;
+                        }
+                        break;
+                case WBC_ID_TYPE_NOT_SPECIFIED:
+                        break;
+                }
+        }
         ret = true;
 fail:

vendor/current/source3/passdb/pdb_get_set.c

@@ -40 +40 @@
 
 /*********************************************************************
+ Test if a change time is a max value. Copes with old and new values
+ of max.
+ ********************************************************************/
+
+bool pdb_is_password_change_time_max(time_t test_time)
+{
+        if (test_time == get_time_t_max()) {
+                return true;
+        }
+#if (defined(SIZEOF_TIME_T) && (SIZEOF_TIME_T == 8))
+        if (test_time == 0x7FFFFFFFFFFFFFFFLL) {
+                return true;
+        }
+#endif
+        if (test_time == 0x7FFFFFFF) {
+                return true;
+        }
+        return false;
+}
+
+/*********************************************************************
+ Return an unchanging version of max password change time - 0x7FFFFFFF.
+ ********************************************************************/
+
+time_t pdb_password_change_time_max(void)
+{
+        return 0x7FFFFFFF;
+}
+
+/*********************************************************************
  Collection of get...() functions for struct samu.
  ********************************************************************/
@@ -87 +117 @@
            to indicate that the user cannot change their password.  jmcd
         */
-        if (sampass->pass_can_change_time == get_time_t_max() &&
+        if (pdb_is_password_change_time_max(sampass->pass_can_change_time) &&
             IS_SAM_CHANGED(sampass, PDB_CANCHANGETIME))
                 return sampass->pass_can_change_time;
@@ -113 +143 @@
 
         if (sampass->acct_ctrl & ACB_PWNOEXP)
-                return get_time_t_max();
+                return pdb_password_change_time_max();
 
         if (!pdb_get_account_policy(PDB_POLICY_MAX_PASSWORD_AGE, &expire)
@@ -124 +154 @@
 bool pdb_get_pass_can_change(const struct samu *sampass)
 {
-        if (sampass->pass_can_change_time == get_time_t_max())
+        if (pdb_is_password_change_time_max(sampass->pass_can_change_time))
                 return False;
         return True;
@@ -959 +989 @@
 {
         return pdb_set_pass_can_change_time(sampass, 
-                                     canchange ? 0 : get_time_t_max(),
+                                     canchange ? 0 : pdb_password_change_time_max(),
                                      PDB_CHANGED);
 }

vendor/current/source3/passdb/pdb_interface.c

@@ -185 +185 @@
 
         if ( pdb && reload ) {
-                pdb->free_private_data( &(pdb->private_data) );
+                if (pdb->free_private_data != NULL) {
+                        pdb->free_private_data( &(pdb->private_data) );
+                }
                 if ( !NT_STATUS_IS_OK( make_pdb_method_name( &pdb, lp_passdb_backend() ) ) ) {
                         char *msg = NULL;

vendor/current/source3/passdb/pdb_ldap.c

@@ -3038 +3038 @@
                 DEBUG(3, ("primary group of [%s] not found\n",
                           pdb_get_username(user)));
+                ret = NT_STATUS_INTERNAL_DB_CORRUPTION;
                 goto done;
         }

vendor/current/source3/passdb/proto.h

@@ -113 +113 @@
 /* The following definitions come from passdb/pdb_get_set.c  */
 
+bool pdb_is_password_change_time_max(time_t test_time);
 uint32_t pdb_get_acct_ctrl(const struct samu *sampass);
 time_t pdb_get_logon_time(const struct samu *sampass);