6972305 Preferred DC not selected after setting pdc via sharectl

6971047 smbd hang during FVT regression test
6711195 Sparc:Get error "Windows Explorer has stopped working" once click on Details fr Properties on Vista
PSARC/2009/464 Offline attribute
6972515 Offline attribute - PSARC 2009/464
PSARC/2010/037 Windows Sparse Attribute
6972519 Windows Sparse Attribute - PSARC 2010/037
6719444 [CLI] - idmap help's output is not consistent with man pages's
6975449 idmap test suite needs idmap_cache_get_data() from libidmap
6974351 OpenSSL still taking smbd down

--HG--
rename : usr/src/lib/libidmap/common/idmap_priv.h => usr/src/cmd/idmap/idmap/namemaps.h

1 files changed, 0 insertions, 21 deletions

diff --git a/usr/src/lib/smbsrv/libmlsvc/common/mlsvc.h b/usr/src/lib/smbsrv/libmlsvc/common/mlsvc.h
index 3275133375..8a5d55785b 100644
--- a/usr/src/lib/smbsrv/libmlsvc/common/mlsvc.h
+++ b/usr/src/lib/smbsrv/libmlsvc/common/mlsvc.h
@@ -25,7 +25,6 @@
 #ifndef _SMBSRV_MLSVC_H
 #define	_SMBSRV_MLSVC_H
 
-#include <cups/cups.h>
 #include <smbsrv/smb_share.h>
 #include <smbsrv/ndl/netlogon.ndl>
 
@@ -80,26 +79,6 @@ void smb_quota_fini(void);
 void smb_quota_add_fs(const char *);
 void smb_quota_remove_fs(const char *);
 
-typedef struct smb_cups_ops {
-	void *cups_hdl;
-	cups_lang_t *(*cupsLangDefault)();
-	const char *(*cupsLangEncoding)(cups_lang_t *);
-	void (*cupsLangFree)(cups_lang_t *);
-	ipp_status_t (*cupsLastError)();
-	int (*cupsGetDests)(cups_dest_t **);
-	void (*cupsFreeDests)(int, cups_dest_t *);
-	ipp_t *(*cupsDoFileRequest)(http_t *, ipp_t *, const char *,
-	    const char *);
-	ipp_t *(*ippNew)();
-	void (*ippDelete)();
-	char *(*ippErrorString)();
-	ipp_attribute_t *(*ippAddString)();
-	void (*httpClose)(http_t *);
-	http_t *(*httpConnect)(const char *, int);
-} smb_cups_ops_t;
-
-smb_cups_ops_t *spoolss_cups_ops(void);
-
 #ifdef __cplusplus
 }
 #endif