svn commit: samba r11988 - in branches/SAMBA_4_0/source/lib/ldb/tools: .

abartlet at samba.org abartlet at samba.org
Thu Dec 1 04:52:55 GMT 2005


Author: abartlet
Date: 2005-12-01 04:52:54 +0000 (Thu, 01 Dec 2005)
New Revision: 11988

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11988

Log:
Setup the sessionInfo just before the connect, rather than earlier
when we havn't finished popt.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c	2005-12-01 04:50:28 UTC (rev 11987)
+++ branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c	2005-12-01 04:52:54 UTC (rev 11988)
@@ -76,10 +76,6 @@
 		goto failed;
 	}
 
-	if (ldb_set_opaque(ldb, "sessionInfo", system_session(ldb))) {
-		goto failed;
-	}
-
 #endif
 
 	ret = talloc_zero(ldb, struct ldb_cmdline);
@@ -169,6 +165,12 @@
 		if (options.nosync) {
 			flags |= LDB_FLG_NOSYNC;
 		}
+
+#ifdef _SAMBA_BUILD_
+		if (ldb_set_opaque(ldb, "sessionInfo", system_session(ldb))) {
+			goto failed;
+		}
+#endif
 		if (ldb_connect(ldb, ret->url, flags, ret->options) != 0) {
 			fprintf(stderr, "Failed to connect to %s - %s\n", 
 				ret->url, ldb_errstring(ldb));



More information about the samba-cvs mailing list