svn commit: samba r12714 - branches/SAMBA_3_0/source/lib branches/SAMBA_3_0/source/passdb trunk/source/lib trunk/source/passdb

[gd at samba.org]

Author: gd
Date: 2006-01-04 13:04:43 +0000 (Wed, 04 Jan 2006)
New Revision: 12714

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

Log:
Fix segfault in pdb_nds.c.

Guenther

Modified:
   branches/SAMBA_3_0/source/lib/smbldap.c
   branches/SAMBA_3_0/source/passdb/pdb_nds.c
   trunk/source/lib/smbldap.c
   trunk/source/passdb/pdb_nds.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/smbldap.c
===================================================================
--- branches/SAMBA_3_0/source/lib/smbldap.c	2006-01-04 12:48:54 UTC (rev 12713)
+++ branches/SAMBA_3_0/source/lib/smbldap.c	2006-01-04 13:04:43 UTC (rev 12714)
@@ -664,21 +664,21 @@
  open a connection to the ldap server (just until the bind)
  ******************************************************************/
 
-int smb_ldap_setup_full_conn(LDAP *ldap_struct, const char *uri)
+int smb_ldap_setup_full_conn(LDAP **ldap_struct, const char *uri)
 {
 	int rc, version;
 
-	rc = smb_ldap_setup_conn(&ldap_struct, uri);
+	rc = smb_ldap_setup_conn(ldap_struct, uri);
 	if (rc) {
 		return rc;
 	}
 
-	rc = smb_ldap_upgrade_conn(ldap_struct, &version);
+	rc = smb_ldap_upgrade_conn(*ldap_struct, &version);
 	if (rc) {
 		return rc;
 	}
 
-	rc = smb_ldap_start_tls(ldap_struct, version);
+	rc = smb_ldap_start_tls(*ldap_struct, version);
 	if (rc) {
 		return rc;
 	}

Modified: branches/SAMBA_3_0/source/passdb/pdb_nds.c
===================================================================
--- branches/SAMBA_3_0/source/passdb/pdb_nds.c	2006-01-04 12:48:54 UTC (rev 12713)
+++ branches/SAMBA_3_0/source/passdb/pdb_nds.c	2006-01-04 13:04:43 UTC (rev 12714)
@@ -807,7 +807,7 @@
 
 		if((success != True) || (got_clear_text_pw == True)) {
 			
-			rc = smb_ldap_setup_full_conn(ld, ldap_state->location);
+			rc = smb_ldap_setup_full_conn(&ld, ldap_state->location);
 			if (rc) {
 				return NT_STATUS_INVALID_CONNECTION;
 			}

Modified: trunk/source/lib/smbldap.c
===================================================================
--- trunk/source/lib/smbldap.c	2006-01-04 12:48:54 UTC (rev 12713)
+++ trunk/source/lib/smbldap.c	2006-01-04 13:04:43 UTC (rev 12714)
@@ -723,21 +723,21 @@
  open a connection to the ldap server (just until the bind)
  ******************************************************************/
 
-int smb_ldap_setup_full_conn(LDAP *ldap_struct, const char *uri)
+int smb_ldap_setup_full_conn(LDAP **ldap_struct, const char *uri)
 {
 	int rc, version;
 
-	rc = smb_ldap_setup_conn(&ldap_struct, uri);
+	rc = smb_ldap_setup_conn(ldap_struct, uri);
 	if (rc) {
 		return rc;
 	}
 
-	rc = smb_ldap_upgrade_conn(ldap_struct, &version);
+	rc = smb_ldap_upgrade_conn(*ldap_struct, &version);
 	if (rc) {
 		return rc;
 	}
 
-	rc = smb_ldap_start_tls(ldap_struct, version);
+	rc = smb_ldap_start_tls(*ldap_struct, version);
 	if (rc) {
 		return rc;
 	}

Modified: trunk/source/passdb/pdb_nds.c
===================================================================
--- trunk/source/passdb/pdb_nds.c	2006-01-04 12:48:54 UTC (rev 12713)
+++ trunk/source/passdb/pdb_nds.c	2006-01-04 13:04:43 UTC (rev 12714)
@@ -808,7 +808,7 @@
 
 		if((success != True) || (got_clear_text_pw == True)) {
 			
-			rc = smb_ldap_setup_full_conn(ld, ldap_state->location);
+			rc = smb_ldap_setup_full_conn(&ld, ldap_state->location);
 			if (rc) {
 				return NT_STATUS_INVALID_CONNECTION;
 			}