diff options
| author | Gerald Carter <jerry@samba.org> | 2004-08-31 15:11:41 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:52:32 -0500 |
| commit | 278f9467f2079044497e3fd4c5358c280f179e41 (patch) | |
| tree | 3bbbf315863dacb18e984e851356a8b67832038f /source3/lib/util.c | |
| parent | a79469a27f48bf4353b8f918f96af7e2d7bf384a (diff) | |
| download | samba-278f9467f2079044497e3fd4c5358c280f179e41.tar.gz samba-278f9467f2079044497e3fd4c5358c280f179e41.tar.bz2 samba-278f9467f2079044497e3fd4c5358c280f179e41.zip | |
r2133: Several fixes:
* BUG 1627: fix for NIS compiles on HPUX 11.00, AIX 4.3 and 5.1
patch from Olaf Flebbe <o.flebbe@science-computing.de>.
Will need to watch this one in the build farm.
* Fix bug found by rwf@loonybin.net where the PRINT_ATTRIBUTE_PUBLISHED
was getting reset by attempts to sanitize the defined attributes
(PRINTER_ATTRIBUTE_SAMBA)
* Resolve name conflict on DEC OSF-5.1 (inspired by patch from
Adharsh Praveen <rprav@india.hp.com>)
* Work around parsing error in the print change notify code
(not that the alignment bug is still there but reording the
entries in the array works around it).
* remove duplicate declaration of getprintprocdir from rpcclient.
(This used to be commit 7474c6a446037f3ca2546cb6984d800bfc524029)
Diffstat (limited to 'source3/lib/util.c')
| -rw-r--r-- | source3/lib/util.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c index 37933d1361..a456395cad 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -46,10 +46,6 @@ #include <rpcsvc/nis.h> -#else /* !WITH_NISPLUS_HOME */ - -#include "rpcsvc/ypclnt.h" - #endif /* WITH_NISPLUS_HOME */ #endif /* HAVE_NETGROUP && WITH_AUTOMOUNT */ @@ -1123,7 +1119,7 @@ static void strip_mount_options( pstring *str) *******************************************************************/ #ifdef WITH_NISPLUS_HOME -char *automount_lookup(const char *user_name) +char *automount_lookup( char *user_name) { static fstring last_key = ""; static pstring last_value = ""; @@ -1166,7 +1162,7 @@ char *automount_lookup(const char *user_name) } #else /* WITH_NISPLUS_HOME */ -char *automount_lookup(const char *user_name) +char *automount_lookup( char *user_name) { static fstring last_key = ""; static pstring last_value = ""; |