svn commit: samba r22977 - in branches: SAMBA_3_0/source/passdb SAMBA_3_0_25/source/passdb SAMBA_3_0_26/source/passdb

[jerry at samba.org]

Author: jerry
Date: 2007-05-17 19:56:54 +0000 (Thu, 17 May 2007)
New Revision: 22977

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

Log:
Trim noise by removing redundant WARNING log message that
would flood at log level 2.  We know when we're using the legacy
mapping code anyways since it will log an informative msg.


Modified:
   branches/SAMBA_3_0/source/passdb/lookup_sid.c
   branches/SAMBA_3_0_25/source/passdb/lookup_sid.c
   branches/SAMBA_3_0_26/source/passdb/lookup_sid.c


Changeset:
Modified: branches/SAMBA_3_0/source/passdb/lookup_sid.c
===================================================================
--- branches/SAMBA_3_0/source/passdb/lookup_sid.c	2007-05-17 19:26:08 UTC (rev 22976)
+++ branches/SAMBA_3_0/source/passdb/lookup_sid.c	2007-05-17 19:56:54 UTC (rev 22977)
@@ -1328,7 +1328,6 @@
 
 	if (!winbind_uid_to_sid(psid, uid)) {
 		if (!winbind_ping()) {
-			DEBUG(2, ("WARNING: Winbindd not running, mapping ids with legacy code\n"));
 			legacy_uid_to_sid(psid, uid);
 			return;
 		}
@@ -1358,7 +1357,6 @@
 
 	if (!winbind_gid_to_sid(psid, gid)) {
 		if (!winbind_ping()) {
-			DEBUG(2, ("WARNING: Winbindd not running, mapping ids with legacy code\n"));
 			legacy_gid_to_sid(psid, gid);
 			return;
 		}
@@ -1392,7 +1390,6 @@
 
 	if (!winbind_sid_to_uid(puid, psid)) {
 		if (!winbind_ping()) {
-			DEBUG(2, ("WARNING: Winbindd not running, mapping ids with legacy code\n"));
 			return legacy_sid_to_uid(psid, puid);
 		}
 
@@ -1431,7 +1428,6 @@
 
 	if ( !winbind_sid_to_gid(pgid, psid) ) {
 		if (!winbind_ping()) {
-			DEBUG(2, ("WARNING: Winbindd not running, mapping ids with legacy code\n"));
 			return legacy_sid_to_gid(psid, pgid);
 		}
 

Modified: branches/SAMBA_3_0_25/source/passdb/lookup_sid.c
===================================================================
--- branches/SAMBA_3_0_25/source/passdb/lookup_sid.c	2007-05-17 19:26:08 UTC (rev 22976)
+++ branches/SAMBA_3_0_25/source/passdb/lookup_sid.c	2007-05-17 19:56:54 UTC (rev 22977)
@@ -1329,7 +1329,6 @@
 
 	if (!winbind_uid_to_sid(psid, uid)) {
 		if (!winbind_ping()) {
-			DEBUG(2, ("WARNING: Winbindd not running, mapping ids with legacy code\n"));
 			legacy_uid_to_sid(psid, uid);
 			return;
 		}
@@ -1359,7 +1358,6 @@
 
 	if (!winbind_gid_to_sid(psid, gid)) {
 		if (!winbind_ping()) {
-			DEBUG(2, ("WARNING: Winbindd not running, mapping ids with legacy code\n"));
 			legacy_gid_to_sid(psid, gid);
 			return;
 		}
@@ -1393,7 +1391,6 @@
 
 	if (!winbind_sid_to_uid(puid, psid)) {
 		if (!winbind_ping()) {
-			DEBUG(2, ("WARNING: Winbindd not running, mapping ids with legacy code\n"));
 			return legacy_sid_to_uid(psid, puid);
 		}
 
@@ -1432,7 +1429,6 @@
 
 	if ( !winbind_sid_to_gid(pgid, psid) ) {
 		if (!winbind_ping()) {
-			DEBUG(2, ("WARNING: Winbindd not running, mapping ids with legacy code\n"));
 			return legacy_sid_to_gid(psid, pgid);
 		}
 

Modified: branches/SAMBA_3_0_26/source/passdb/lookup_sid.c
===================================================================
--- branches/SAMBA_3_0_26/source/passdb/lookup_sid.c	2007-05-17 19:26:08 UTC (rev 22976)
+++ branches/SAMBA_3_0_26/source/passdb/lookup_sid.c	2007-05-17 19:56:54 UTC (rev 22977)
@@ -1329,7 +1329,6 @@
 
 	if (!winbind_uid_to_sid(psid, uid)) {
 		if (!winbind_ping()) {
-			DEBUG(2, ("WARNING: Winbindd not running, mapping ids with legacy code\n"));
 			legacy_uid_to_sid(psid, uid);
 			return;
 		}
@@ -1359,7 +1358,6 @@
 
 	if (!winbind_gid_to_sid(psid, gid)) {
 		if (!winbind_ping()) {
-			DEBUG(2, ("WARNING: Winbindd not running, mapping ids with legacy code\n"));
 			legacy_gid_to_sid(psid, gid);
 			return;
 		}
@@ -1393,7 +1391,6 @@
 
 	if (!winbind_sid_to_uid(puid, psid)) {
 		if (!winbind_ping()) {
-			DEBUG(2, ("WARNING: Winbindd not running, mapping ids with legacy code\n"));
 			return legacy_sid_to_uid(psid, puid);
 		}
 
@@ -1432,7 +1429,6 @@
 
 	if ( !winbind_sid_to_gid(pgid, psid) ) {
 		if (!winbind_ping()) {
-			DEBUG(2, ("WARNING: Winbindd not running, mapping ids with legacy code\n"));
 			return legacy_sid_to_gid(psid, pgid);
 		}