svn commit: samba r16056 - in branches/SAMBA_4_0/source: auth/gensec heimdal/lib/hdb kdc

abartlet at samba.org abartlet at samba.org
Tue Jun 6 04:50:21 GMT 2006


Author: abartlet
Date: 2006-06-06 04:50:14 +0000 (Tue, 06 Jun 2006)
New Revision: 16056

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

Log:
Fix errors found by trying to use our kpasswd server and the Apple client.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/auth/gensec/gensec_krb5.c
   branches/SAMBA_4_0/source/heimdal/lib/hdb/keytab.c
   branches/SAMBA_4_0/source/kdc/hdb-ldb.c


Changeset:
Modified: branches/SAMBA_4_0/source/auth/gensec/gensec_krb5.c
===================================================================
--- branches/SAMBA_4_0/source/auth/gensec/gensec_krb5.c	2006-06-06 03:19:15 UTC (rev 16055)
+++ branches/SAMBA_4_0/source/auth/gensec/gensec_krb5.c	2006-06-06 04:50:14 UTC (rev 16056)
@@ -151,7 +151,7 @@
 		}
 	}
 
-	peer_addr = gensec_get_my_addr(gensec_security);
+	peer_addr = gensec_get_peer_addr(gensec_security);
 	if (peer_addr && peer_addr->sockaddr) {
 		ret = krb5_sockaddr2address(gensec_krb5_state->smb_krb5_context->krb5_context, 
 					    peer_addr->sockaddr, &peer_krb5_addr);

Modified: branches/SAMBA_4_0/source/heimdal/lib/hdb/keytab.c
===================================================================
--- branches/SAMBA_4_0/source/heimdal/lib/hdb/keytab.c	2006-06-06 03:19:15 UTC (rev 16055)
+++ branches/SAMBA_4_0/source/heimdal/lib/hdb/keytab.c	2006-06-06 04:50:14 UTC (rev 16056)
@@ -218,7 +218,7 @@
 	(*db->hdb_destroy)(context, db);
 	return ret;
     }
-    ret = (*db->hdb_fetch)(context, db, principal, HDB_F_DECRYPT, &ent);
+    ret = (*db->hdb_fetch)(context, db, principal, HDB_F_DECRYPT|HDB_F_GET_CLIENT|HDB_F_GET_SERVER, &ent);
 
 
     /* Shutdown the hdb on error */

Modified: branches/SAMBA_4_0/source/kdc/hdb-ldb.c
===================================================================
--- branches/SAMBA_4_0/source/kdc/hdb-ldb.c	2006-06-06 03:19:15 UTC (rev 16055)
+++ branches/SAMBA_4_0/source/kdc/hdb-ldb.c	2006-06-06 04:50:14 UTC (rev 16056)
@@ -611,13 +611,10 @@
 					      &msg, &realm_ref_msg);
 	free(principal_string);
 	if (NT_STATUS_EQUAL(nt_status, NT_STATUS_NO_SUCH_USER)) {
-		talloc_free(mem_ctx);
 		return HDB_ERR_NOENTRY;
 	} else if (NT_STATUS_EQUAL(nt_status, NT_STATUS_NO_MEMORY)) {
-		talloc_free(mem_ctx);
 		return ENOMEM;
 	} else if (!NT_STATUS_IS_OK(nt_status)) {
-		talloc_free(mem_ctx);
 		return EINVAL;
 	}
 	
@@ -788,7 +785,7 @@
 				 unsigned flags,
 				 hdb_entry_ex *entry_ex)
 {
-	krb5_error_code ret;
+	krb5_error_code ret = HDB_ERR_NOENTRY;
 
 	TALLOC_CTX *mem_ctx = talloc_named(db, 0, "LDB_fetch context");
 



More information about the samba-cvs mailing list