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/include | |
| 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/include')
| -rw-r--r-- | source3/include/includes.h | 6 | ||||
| -rwxr-xr-x | source3/include/rpc_spoolss.h | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 8e9e7b0a46..66994e9ca9 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -369,12 +369,12 @@ #endif #if defined (HAVE_NETGROUP) -#if defined(HAVE_RPCSVC_YP_PROT_H) -#include <rpcsvc/yp_prot.h> -#endif #if defined(HAVE_RPCSVC_YPCLNT_H) #include <rpcsvc/ypclnt.h> #endif +#if defined(HAVE_RPCSVC_YP_PROT_H) +#include <rpcsvc/yp_prot.h> +#endif #endif /* HAVE_NETGROUP */ #if defined(HAVE_SYS_IPC_H) diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h index 7f82c2634f..f2b78f91bc 100755 --- a/source3/include/rpc_spoolss.h +++ b/source3/include/rpc_spoolss.h @@ -376,6 +376,7 @@ PRINTER_MESSAGE_INFO; #define PRINTER_ATTRIBUTE_SAMBA (PRINTER_ATTRIBUTE_RAW_ONLY|\ PRINTER_ATTRIBUTE_SHARED|\ PRINTER_ATTRIBUTE_LOCAL) +#define PRINTER_ATTRIBUTE_NOT_SAMBA (PRINTER_ATTRIBUTE_NETWORK) #define NO_PRIORITY 0 #define MAX_PRIORITY 99 |