Author: jerry Date: 2006-08-07 12:04:28 +0000 (Mon, 07 Aug 2006) New Revision: 17436
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17436 Log: revert simo's netgroup fix for now since I'm trying to release 3.09.23b today Modified: branches/SAMBA_3_0_23/source/lib/access.c branches/SAMBA_3_0_23/source/smbd/password.c Changeset: Modified: branches/SAMBA_3_0_23/source/lib/access.c =================================================================== --- branches/SAMBA_3_0_23/source/lib/access.c 2006-08-06 23:43:02 UTC (rev 17435) +++ branches/SAMBA_3_0_23/source/lib/access.c 2006-08-07 12:04:28 UTC (rev 17436) @@ -83,7 +83,8 @@ yp_get_default_domain(&mydomain); if (!mydomain) { - DEBUG(0,("Unable to get default yp domain. Try without it.\n")); + DEBUG(0,("Unable to get default yp domain.\n")); + return False; } if (!(hostname = SMB_STRDUP(s))) { DEBUG(1,("out of memory for strdup!\n")); @@ -94,7 +95,7 @@ DEBUG(5,("looking for %s of domain %s in netgroup %s gave %s\n", hostname, - mydomain?mydomain:"(ANY)", + mydomain, tok+1, BOOLSTR(netgroup_ok))); Modified: branches/SAMBA_3_0_23/source/smbd/password.c =================================================================== --- branches/SAMBA_3_0_23/source/smbd/password.c 2006-08-06 23:43:02 UTC (rev 17435) +++ branches/SAMBA_3_0_23/source/smbd/password.c 2006-08-07 12:04:28 UTC (rev 17436) @@ -420,11 +420,12 @@ yp_get_default_domain(&mydomain); if(mydomain == NULL) { - DEBUG(5,("Unable to get default yp domain, let's try without specifying it\n")); + DEBUG(5,("Unable to get default yp domain\n")); + return False; } DEBUG(5,("looking for user %s of domain %s in netgroup %s\n", - user, mydomain?mydomain:"(ANY)", ngname)); + user, mydomain, ngname)); if (innetgr(ngname, NULL, user, mydomain)) { DEBUG(5,("user_in_netgroup: Found\n")); @@ -440,7 +441,7 @@ strlower_m(lowercase_user); DEBUG(5,("looking for user %s of domain %s in netgroup %s\n", - lowercase_user, mydomain?mydomain:"(ANY)", ngname)); + lowercase_user, mydomain, ngname)); if (innetgr(ngname, NULL, lowercase_user, mydomain)) { DEBUG(5,("user_in_netgroup: Found\n"));
