Changeset 221 for branches/samba-3.3.x/source/passdb

Timestamp:

May 24, 2009, 7:17:10 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.1

Location:

branches/samba-3.3.x/source/passdb

Files:

• pdb_ldap.c (modified) (8 diffs)
• pdb_tdb.c (modified) (3 diffs)

branches/samba-3.3.x/source/passdb/pdb_ldap.c

@@ -1250 +1250 @@
                         pdb_get_profile_path(sampass));
 
-        if (asprintf(&temp, "%li", pdb_get_logon_time(sampass)) < 0) {
+        if (asprintf(&temp, "%li", (long int)pdb_get_logon_time(sampass)) < 0) {
                 return false;
         }
@@ -1258 +1258 @@
         SAFE_FREE(temp);
 
-        if (asprintf(&temp, "%li", pdb_get_logoff_time(sampass)) < 0) {
+        if (asprintf(&temp, "%li", (long int)pdb_get_logoff_time(sampass)) < 0) {
                 return false;
         }
@@ -1266 +1266 @@
         SAFE_FREE(temp);
 
-        if (asprintf(&temp, "%li", pdb_get_kickoff_time(sampass)) < 0) {
+        if (asprintf(&temp, "%li", (long int)pdb_get_kickoff_time(sampass)) < 0) {
                 return false;
         }
@@ -1274 +1274 @@
         SAFE_FREE(temp);
 
-        if (asprintf(&temp, "%li", pdb_get_pass_can_change_time_noncalc(sampass)) < 0) {
+        if (asprintf(&temp, "%li", (long int)pdb_get_pass_can_change_time_noncalc(sampass)) < 0) {
                 return false;
         }
@@ -1282 +1282 @@
         SAFE_FREE(temp);
 
-        if (asprintf(&temp, "%li", pdb_get_pass_must_change_time(sampass)) < 0) {
+        if (asprintf(&temp, "%li", (long int)pdb_get_pass_must_change_time(sampass)) < 0) {
                 return false;
         }
@@ -1362 +1362 @@
                 if (need_update(sampass, PDB_PASSLASTSET)) {
                         if (asprintf(&temp, "%li",
-                                pdb_get_pass_last_set_time(sampass)) < 0) {
+                                (long int)pdb_get_pass_last_set_time(sampass)) < 0) {
                                 return false;
                         }
@@ -1424 +1424 @@
                         SAFE_FREE(temp);
 
-                        if (asprintf(&temp, "%li", badtime) < 0) {
+                        if (asprintf(&temp, "%li", (long int)badtime) < 0) {
                                 return false;
                         }
@@ -5942 +5942 @@
                          sid_string_tos(sid));
         smbldap_make_mod(priv2ld(ldap_state), entry, &mods, "sambaPwdLastSet",
-                         talloc_asprintf(talloc_tos(), "%li", time(NULL)));
+                         talloc_asprintf(talloc_tos(), "%li", (long int)time(NULL)));
         smbldap_make_mod(priv2ld(ldap_state), entry, &mods,
                          "sambaClearTextPassword", pwd);

branches/samba-3.3.x/source/passdb/pdb_tdb.c

@@ -358 +358 @@
 
         if ( !tdbsam_open( tdbsam_filename ) ) {
-                DEBUG(0,("tdbsam_getsampwnam: failed to open %s!\n", tdbsam_filename));
+                DEBUG(0,("tdbsam_getsampwrid: failed to open %s!\n", tdbsam_filename));
                 return NT_STATUS_ACCESS_DENIED;
         }
@@ -401 +401 @@
 
         /* it's outaa here!  8^) */
+        if ( !tdbsam_open( tdbsam_filename ) ) {
+                DEBUG(0,("tdb_delete_samacct_only: failed to open %s!\n",
+                         tdbsam_filename));
+                return false;
+        }
 
         status = dbwrap_delete_bystring(db_sam, keystr);
@@ -778 +783 @@
         rid = BASE_RID;         /* Default if not set */
 
+        if (!tdbsam_open(tdbsam_filename)) {
+                DEBUG(0,("tdbsam_new_rid: failed to open %s!\n",
+                        tdbsam_filename));
+                return false;
+        }
+
         if (dbwrap_change_uint32_atomic(db_sam, NEXT_RID_STRING, &rid, 1) != 0) {
                 DEBUG(3, ("tdbsam_new_rid: Failed to increase %s\n",