[SCM] Samba Shared Repository - branch v3-6-test updated

Stefan Metzmacher metze at samba.org
Wed Mar 2 06:59:50 MST 2011


The branch, v3-6-test has been updated
       via  19abfba s3:idmap_cache: remove an leftover wip comment
       via  c6ddf70 s3: adjust loglevel for idmap_cache
      from  1046a5e librpc/idl: remove unused string defines from idl_types.h

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 19abfbacd8bea266715c13cce6e2a109ca4eef1e
Author: Michael Adam <obnox at samba.org>
Date:   Wed Mar 2 13:58:37 2011 +0100

    s3:idmap_cache: remove an leftover wip comment
    
    Autobuild-User: Michael Adam <obnox at samba.org>
    Autobuild-Date: Wed Mar  2 14:55:20 CET 2011 on sn-devel-104
    (cherry picked from commit d9945e93694859c9606e17078fabc2e23b5421fe)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

commit c6ddf70a238f2341768afdcd28d7db4218c6dd94
Author: Gregor Beck <gbeck at sernet.de>
Date:   Tue Mar 1 17:18:31 2011 +0100

    s3: adjust loglevel for idmap_cache
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 8aa69c1f814b215c1b2e48393373878ba87dad0d)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/idmap_cache.c |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/idmap_cache.c b/source3/lib/idmap_cache.c
index e2270eb..6783215 100644
--- a/source3/lib/idmap_cache.c
+++ b/source3/lib/idmap_cache.c
@@ -292,27 +292,27 @@ static bool idmap_cache_del_xid(char t, int xid)
 	bool ret = true;
 
 	if (!gencache_get(key, &sid_str, &timeout)) {
-		DEBUG(0, ("no entry: %s\n", key));
-		ret = false; //???
+		DEBUG(3, ("no entry: %s\n", key));
+		ret = false;
 		goto done;
 	}
 
 	if (sid_str[0] != '-') {
 		const char* sid_key = key_sid2xid_str(mem_ctx, t, sid_str);
 		if (!gencache_del(sid_key)) {
-			DEBUG(0, ("failed to delete: %s\n", sid_key));
+			DEBUG(2, ("failed to delete: %s\n", sid_key));
 			ret = false;
 		} else {
-			DEBUG(0, ("delete: %s\n", sid_key));
+			DEBUG(5, ("delete: %s\n", sid_key));
 		}
 
 	}
 
 	if (!gencache_del(key)) {
-		DEBUG(0, ("failed to delete: %s\n", key));
+		DEBUG(1, ("failed to delete: %s\n", key));
 		ret = false;
 	} else {
-		DEBUG(0, ("delete: %s\n", key));
+		DEBUG(5, ("delete: %s\n", key));
 	}
 
 done:
@@ -343,18 +343,18 @@ static bool idmap_cache_del_sid2xid(TALLOC_CTX* mem_ctx, char t, const char* sid
 	if (atoi(xid_str) != -1) {
 		const char* xid_key = key_xid2sid_str(mem_ctx, t, xid_str);
 		if (!gencache_del(xid_key)) {
-			DEBUG(0, ("failed to delete: %s\n", xid_key));
+			DEBUG(2, ("failed to delete: %s\n", xid_key));
 			ret = false;
 		} else {
-			DEBUG(0, ("delete: %s\n", xid_key));
+			DEBUG(5, ("delete: %s\n", xid_key));
 		}
 	}
 
 	if (!gencache_del(sid_key)) {
-		DEBUG(0, ("failed to delete: %s\n", sid_key));
+		DEBUG(2, ("failed to delete: %s\n", sid_key));
 		ret = false;
 	} else {
-		DEBUG(0, ("delete: %s\n", sid_key));
+		DEBUG(5, ("delete: %s\n", sid_key));
 	}
 done:
 	return ret;
@@ -369,7 +369,7 @@ bool idmap_cache_del_sid(const struct dom_sid *sid)
 	if (!idmap_cache_del_sid2xid(mem_ctx, 'U', sid_str) &&
 	    !idmap_cache_del_sid2xid(mem_ctx, 'G', sid_str))
 	{
-		DEBUG(0, ("no entry: %s\n", key_xid2sid_str(mem_ctx, '?', sid_str)));
+		DEBUG(3, ("no entry: %s\n", key_xid2sid_str(mem_ctx, '?', sid_str)));
 		ret = false;
 	}
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list