svn commit: samba r2647 - in trunk/source/passdb: .

[mimir at samba.org]

Author: mimir
Date: 2004-09-26 03:14:26 +0000 (Sun, 26 Sep 2004)
New Revision: 2647

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/trunk/source/passdb&rev=2647&nolog=1

Log:
1) Deal with null pointer returned when secrets.tdb haven't ever heard
   about trust passwords migration.
2) Typo fix - don't pass int value as a pointer


rafal


Modified:
   trunk/source/passdb/secrets.c


Changeset:
Modified: trunk/source/passdb/secrets.c
===================================================================
--- trunk/source/passdb/secrets.c	2004-09-26 03:05:04 UTC (rev 2646)
+++ trunk/source/passdb/secrets.c	2004-09-26 03:14:26 UTC (rev 2647)
@@ -854,19 +854,23 @@
 
 BOOL secrets_passwords_migrated(BOOL set_migrated)
 {
-	BOOL migrated, *mig, stored;
+ 	BOOL migrated, *mig = NULL;
 	const char *key = SECRETS_PASSWORDS_MIGRATED;
 	size_t keylen;
 
 	/* tdb key to fetch (and maybe store) */
 	keylen = strlen(key);
 	mig = secrets_fetch(key, &keylen);
-	migrated = *mig;
 
-	if (set_migrated) {
+	if (!set_migrated) {
+		/* if fetching returns NULL, there was definately no migration done yet */
+		if (!mig)
+			return False;
+		else
+			migrated = *mig;
+	} else {
 		/* set "migrated" sign in secrets.tdb */
-		stored = secrets_store(key, (void*)set_migrated, sizeof(set_migrated));
-		return stored;
+		migrated = secrets_store(key, (void*)&set_migrated, sizeof(set_migrated));
 	}
 
 	return migrated;