svn commit: samba r2923 - branches/SAMBA_3_0/source/passdb trunk/source/passdb

[gd at samba.org]

Author: gd
Date: 2004-10-11 21:09:36 +0000 (Mon, 11 Oct 2004)
New Revision: 2923

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/&rev=2923&nolog=1

Log:
Fix some obvious copy/paste leftover debug-messages.

Guenther

Modified:
   branches/SAMBA_3_0/source/passdb/pdb_ldap.c
   trunk/source/passdb/pdb_ldap.c


Changeset:
Modified: branches/SAMBA_3_0/source/passdb/pdb_ldap.c
===================================================================
--- branches/SAMBA_3_0/source/passdb/pdb_ldap.c	2004-10-11 20:56:17 UTC (rev 2922)
+++ branches/SAMBA_3_0/source/passdb/pdb_ldap.c	2004-10-11 21:09:36 UTC (rev 2923)
@@ -161,7 +161,7 @@
 		case SCHEMAVER_SAMBASAMACCOUNT:
 			return get_attr_list( attrib_map_to_delete_v30 );
 		default:
-			DEBUG(0,("get_userattr_list: unknown schema version specified!\n"));
+			DEBUG(0,("get_userattr_delete_list: unknown schema version specified!\n"));
 			break;
 	}
 	
@@ -1396,7 +1396,7 @@
 	}
 
 	if (!init_sam_from_ldap(ldap_state, user, entry)) {
-		DEBUG(1,("ldapsam_getsampwrid: init_sam_from_ldap failed!\n"));
+		DEBUG(1,("ldapsam_getsampwsid: init_sam_from_ldap failed!\n"));
 		ldap_msgfree(result);
 		return NT_STATUS_NO_SUCH_USER;
 	}
@@ -2462,7 +2462,7 @@
 		return NT_STATUS_UNSUCCESSFUL;
 	}
 
-	DEBUG(2, ("ldapsam_setsampwent: %d entries in the base!\n",
+	DEBUG(2, ("ldapsam_setsamgrent: %d entries in the base!\n",
 		  ldap_count_entries(ldap_state->smbldap_state->ldap_struct,
 				     ldap_state->result)));
 
@@ -2586,13 +2586,13 @@
 				   result);
 
 	if (count < 1) {
-		DEBUG(4, ("ldapsam_add_aliasmem: Did not find alias\n"));
+		DEBUG(4, ("ldapsam_modify_aliasmem: Did not find alias\n"));
 		ldap_msgfree(result);
 		return NT_STATUS_NO_SUCH_ALIAS;
 	}
 
 	if (count > 1) {
-		DEBUG(1, ("ldapsam_getgroup: Duplicate entries for filter %s: "
+		DEBUG(1, ("ldapsam_modify_aliasmem: Duplicate entries for filter %s: "
 			  "count=%d\n", filter, count));
 		ldap_msgfree(result);
 		return NT_STATUS_NO_SUCH_ALIAS;
@@ -2627,7 +2627,7 @@
 		ldap_get_option(ldap_state->smbldap_state->ldap_struct,
 				LDAP_OPT_ERROR_STRING,&ld_error);
 		
-		DEBUG(0, ("ldapsam_delete_entry: Could not delete attributes "
+		DEBUG(0, ("ldapsam_modify_aliasmem: Could not modify alias "
 			  "for %s, error: %s (%s)\n", dn, ldap_err2string(rc),
 			  ld_error?ld_error:"unknown"));
 		SAFE_FREE(ld_error);
@@ -2685,13 +2685,13 @@
 				   result);
 
 	if (count < 1) {
-		DEBUG(4, ("ldapsam_add_aliasmem: Did not find alias\n"));
+		DEBUG(4, ("ldapsam_enum_aliasmem: Did not find alias\n"));
 		ldap_msgfree(result);
 		return NT_STATUS_NO_SUCH_ALIAS;
 	}
 
 	if (count > 1) {
-		DEBUG(1, ("ldapsam_getgroup: Duplicate entries for filter %s: "
+		DEBUG(1, ("ldapsam_enum_aliasmem: Duplicate entries for filter %s: "
 			  "count=%d\n", filter, count));
 		ldap_msgfree(result);
 		return NT_STATUS_NO_SUCH_ALIAS;

Modified: trunk/source/passdb/pdb_ldap.c
===================================================================
--- trunk/source/passdb/pdb_ldap.c	2004-10-11 20:56:17 UTC (rev 2922)
+++ trunk/source/passdb/pdb_ldap.c	2004-10-11 21:09:36 UTC (rev 2923)
@@ -163,7 +163,7 @@
 		case SCHEMAVER_SAMBASAMACCOUNT:
 			return get_attr_list( attrib_map_to_delete_v30 );
 		default:
-			DEBUG(0,("get_userattr_list: unknown schema version specified!\n"));
+			DEBUG(0,("get_userattr_delete_list: unknown schema version specified!\n"));
 			break;
 	}
 	
@@ -1425,7 +1425,7 @@
 	}
 
 	if (!init_sam_from_ldap(ldap_state, user, entry)) {
-		DEBUG(1,("ldapsam_getsampwrid: init_sam_from_ldap failed!\n"));
+		DEBUG(1,("ldapsam_getsampwsid: init_sam_from_ldap failed!\n"));
 		ldap_msgfree(result);
 		return NT_STATUS_NO_SUCH_USER;
 	}
@@ -2554,7 +2554,7 @@
 		return NT_STATUS_UNSUCCESSFUL;
 	}
 
-	DEBUG(2, ("ldapsam_setsampwent: %d entries in the base!\n",
+	DEBUG(2, ("ldapsam_setsamgrent: %d entries in the base!\n",
 		  ldap_count_entries(ldap_state->smbldap_state->ldap_struct,
 				     ldap_state->result)));
 
@@ -2777,13 +2777,13 @@
 				   result);
 
 	if (count < 1) {
-		DEBUG(4, ("ldapsam_add_aliasmem: Did not find alias\n"));
+		DEBUG(4, ("ldapsam_modify_aliasmem: Did not find alias\n"));
 		ldap_msgfree(result);
 		return NT_STATUS_NO_SUCH_ALIAS;
 	}
 
 	if (count > 1) {
-		DEBUG(1, ("ldapsam_getgroup: Duplicate entries for filter %s: "
+		DEBUG(1, ("ldapsam_modify_aliasmem: Duplicate entries for filter %s: "
 			  "count=%d\n", filter, count));
 		ldap_msgfree(result);
 		return NT_STATUS_NO_SUCH_ALIAS;
@@ -3923,7 +3923,7 @@
 	
 	/* Init LDAP entry from trust password structure */
 	if (!init_ldap_from_trustpw(ldap_state, trustpw_entry, &mod, &trustpw)) {
-		DEBUG(0, ("ldapsam_add_trustpw_passwd: init_ldap_from_trustpw failed!\n"));
+		DEBUG(0, ("ldapsam_add_trust_passwd: init_ldap_from_trustpw failed!\n"));
 		ldap_msgfree(res);
 		if (mod != NULL) ldap_mods_free(mod, True);
 		return NT_STATUS_UNSUCCESSFUL;