From e4201bec142b6666a45c38532f1393270b6b0d48 Mon Sep 17 00:00:00 2001
From: Jim McDonough <jmcd@samba.org>
Date: Mon, 18 Nov 2002 19:59:58 +0000
Subject: Next step of printer publishing. net ads printer publish
 <printername> [servername] Will retreive the DsSpooler and DsDriver info by
 rpc for a remote server then publish it.

Next comes doing it within smbd
(This used to be commit 8f047a4492f7bd66ac2afd2a2f6194d5dad4a434)
---
 source3/include/ads.h | 57 +--------------------------------------------------
 1 file changed, 1 insertion(+), 56 deletions(-)

(limited to 'source3/include')

diff --git a/source3/include/ads.h b/source3/include/ads.h
index 88a90229b1..c8801789ae 100644
--- a/source3/include/ads.h
+++ b/source3/include/ads.h
@@ -38,61 +38,6 @@ typedef struct {
 	} config;
 } ADS_STRUCT;
 
-typedef struct {
-	char *printerName;
-	char *serverName;
-	char *shortServerName;
-	char *versionNumber;
-	char *uNCName;
-	char **description;
-	char *assetNumber;
-	char *bytesPerMinute;
-	char *defaultPriority;
-	char *driverName;
-	char *driverVersion;
-	char *location;
-	char *operatingSystem;
-	char *operatingSystemHotfix;
-	char *operatingSystemServicePack;
-	char *operatingSystemVersion;
-	char *physicalLocationObject;
-	char **portName;
-	char *printAttributes;
-	char **printBinNames;
-	char *printCollate;
-	char *printColor;
-	char *printDuplexSupported;
-	char *printEndTime;
-	char *printFOrmName;
-	char *printKeepPrintedJobs;
-	char **printLanguage;
-	char *printMACAddress;
-	char *printMaxCopies;
-	char *printMaxResolutionSupported;
-	char *printMaxXExtent;
-	char *printMaxYExtent;
-	char **printMediaReady;
-	char **printMediaSupported;
-	char *printMemory;
-	char *printMinXExtent;
-	char *printMinYExtent;
-	char *printNetworkAddress;
-	char *printNotify;
-	char *printNumberUp;
-	char **printOrientationsSupported;
-	char *printOwner;
-	char *printPagesPerMinute;
-	char *printRate;
-	char *printRateUnit;
-	char *printSeparatorFile;
-	char **printShareName;
-	char *printSpooling;
-	char *printStaplingSupported;
-	char *printStartTime;
-	char *printStatus;
-	char *priority;
-} ADS_PRINTER_ENTRY;
-
 /* there are 4 possible types of errors the ads subsystem can produce */
 enum ads_error_type {ADS_ERROR_KRB5, ADS_ERROR_GSS, 
 		     ADS_ERROR_LDAP, ADS_ERROR_SYSTEM, ADS_ERROR_NT};
@@ -122,7 +67,7 @@ typedef void **ADS_MODLIST;
 #define ADS_ERROR_GSS(rc, minor) ads_build_error(ADS_ERROR_GSS, rc, minor)
 #define ADS_ERROR_NT(rc) ads_build_nt_error(ADS_ERROR_NT,rc)
 
-#define ADS_ERR_OK(status) ((status.error_type == ADS_ERROR_NT) ? NT_STATUS_IS_OK(status.err.nt_status):(status.err.rc == 0))
+#define ADS_ERR_OK(status) ({ADS_STATUS errokstat = status;(errokstat.error_type == ADS_ERROR_NT) ? NT_STATUS_IS_OK(errokstat.err.nt_status):(errokstat.err.rc == 0);})
 #define ADS_SUCCESS ADS_ERROR(0)
 
 /* time between reconnect attempts */
-- 
cgit