Author: jerry
Date: 2007-03-01 05:21:31 +0000 (Thu, 01 Mar 2007)
New Revision: 21624

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

Log:
Remove stray #endif from bad merge


Modified:
   branches/SAMBA_3_0_25/source/nsswitch/winbindd.c
   branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd.c


Changeset:
Modified: branches/SAMBA_3_0_25/source/nsswitch/winbindd.c
===================================================================
--- branches/SAMBA_3_0_25/source/nsswitch/winbindd.c    2007-03-01 05:17:33 UTC 
(rev 21623)
+++ branches/SAMBA_3_0_25/source/nsswitch/winbindd.c    2007-03-01 05:21:31 UTC 
(rev 21624)
@@ -1080,7 +1080,6 @@
                DEBUG(0,("unable to initalize domain list\n"));
                exit(1);
        }
-#endif
 
        init_idmap_child();
 

Modified: branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd.c       2007-03-01 
05:17:33 UTC (rev 21623)
+++ branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd.c       2007-03-01 
05:21:31 UTC (rev 21624)
@@ -1080,7 +1080,6 @@
                DEBUG(0,("unable to initalize domain list\n"));
                exit(1);
        }
-#endif
 
        init_idmap_child();
 

Reply via email to