summaryrefslogtreecommitdiff
path: root/source3/include/ads.h
diff options
context:
space:
mode:
authorJim McDonough <jmcd@samba.org>2002-11-18 19:50:36 +0000
committerJim McDonough <jmcd@samba.org>2002-11-18 19:50:36 +0000
commitbbd3e4b40a511bff8656e11fa993dce26e02aa0f (patch)
tree0f0d8ca2c1b2889f2c34cea1b378baa5dd3afabc /source3/include/ads.h
parent28a61607a7c0cd2347ac0b71e26ff52a393c4121 (diff)
downloadsamba-bbd3e4b40a511bff8656e11fa993dce26e02aa0f.tar.gz
samba-bbd3e4b40a511bff8656e11fa993dce26e02aa0f.tar.bz2
samba-bbd3e4b40a511bff8656e11fa993dce26e02aa0f.zip
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 64951938cc5666a757683cbe9bee3a2c20a05323)
Diffstat (limited to 'source3/include/ads.h')
-rw-r--r--source3/include/ads.h57
1 files changed, 1 insertions, 56 deletions
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 */