r3220: merging current 3.0 code to release branch

8 files changed, 19 insertions, 11 deletions

diff --git a/source/include/ads.h b/source/include/ads.h
index 4daa65e796d..de020f2a3f4 100644
--- a/source/include/ads.h
+++ b/source/include/ads.h
@@ -224,3 +224,6 @@ typedef void **ADS_MODLIST;
 #ifndef HAVE_AP_OPTS_USE_SUBKEY
 #define AP_OPTS_USE_SUBKEY 0
 #endif
+
+#define WELL_KNOWN_GUID_COMPUTERS	"AA312825768811D1ADED00C04FD8D5CD" 
+#define WELL_KNOWN_GUID_USERS		"A9D1CA15768811D1ADED00C04FD8D5CD"
diff --git a/source/include/doserr.h b/source/include/doserr.h
index 576aeda2bf7..c6d6b1fac90 100644
--- a/source/include/doserr.h
+++ b/source/include/doserr.h
@@ -183,6 +183,7 @@
 #define WERR_NO_MORE_ITEMS W_ERROR(259)
 #define WERR_MORE_DATA W_ERROR(234)
 #define WERR_INVALID_OWNER W_ERROR(1307)
+#define WERR_IO_PENDING W_ERROR(997)
 #define WERR_CAN_NOT_COMPLETE W_ERROR(1003)
 #define WERR_INVALID_SECURITY_DESCRIPTOR W_ERROR(1338)
 #define WERR_SERVER_UNAVAILABLE W_ERROR(1722)
diff --git a/source/include/includes.h b/source/include/includes.h
index 3ea4eaa35a9..d51e4c53f1a 100644
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -793,9 +793,9 @@ extern int errno;
 #include "ubi_sLinkList.h"
 #include "ubi_dLinkList.h"
 #include "dlinklist.h"
-#include "../tdb/tdb.h"
-#include "../tdb/spinlock.h"
-#include "../tdb/tdbutil.h"
+#include "tdb/tdb.h"
+#include "tdb/spinlock.h"
+#include "tdb/tdbutil.h"
 #include "talloc.h"
 #include "nt_status.h"
 #include "ads.h"
diff --git a/source/include/libsmb_internal.h b/source/include/libsmb_internal.h
index 21fe47d4b29..9111f36eaf7 100644
--- a/source/include/libsmb_internal.h
+++ b/source/include/libsmb_internal.h
@@ -6,7 +6,7 @@
 #define SMBC_DIR_MODE  (S_IFDIR | 0555)
 
 
-#include "../include/libsmbclient.h"
+#include "include/libsmbclient.h"
 
 
 struct _SMBCSRV {
diff --git a/source/include/nt_printing.h b/source/include/nt_printing.h
index 762b1c69170..ee29636c88d 100644
--- a/source/include/nt_printing.h
+++ b/source/include/nt_printing.h
@@ -450,10 +450,8 @@ typedef struct _Printer{
 	uint32 jobid; /* jobid in printing backend */
 	BOOL printer_type;
 	TALLOC_CTX *ctx;
-	union {
-	  	fstring handlename;
-		fstring printerservername;
-	} dev;
+	fstring servername;
+	fstring sharename;
 	uint32 type;
 	uint32 access_granted;
 	struct {
diff --git a/source/include/printing.h b/source/include/printing.h
index bf7c61b251e..fd1e7e43e4e 100644
--- a/source/include/printing.h
+++ b/source/include/printing.h
@@ -47,7 +47,13 @@ struct printjob {
 /* Information for print interfaces */
 struct printif
 {
-  int (*queue_get)(int snum, print_queue_struct **q,
+  /* value of the 'printing' option for this service */
+  enum printing_types type;
+
+  int (*queue_get)(const char *printer_name,
+                   enum printing_types printing_type,
+                   char *lpq_command,
+                   print_queue_struct **q,
                    print_status_struct *status);
   int (*queue_pause)(int snum);
   int (*queue_resume)(int snum);
diff --git a/source/include/rpc_spoolss.h b/source/include/rpc_spoolss.h
index f2b78f91bc0..7c5942759f4 100755
--- a/source/include/rpc_spoolss.h
+++ b/source/include/rpc_spoolss.h
@@ -206,6 +206,7 @@
 
 #define PRINTER_NOTIFY_TYPE 0x00
 #define JOB_NOTIFY_TYPE     0x01
+#define PRINT_TABLE_END     0xFF
 
 #define MAX_PRINTER_NOTIFY 26
 #define MAX_JOB_NOTIFY 24
diff --git a/source/include/smb.h b/source/include/smb.h
index 7317fd16b0f..bc99a2a6fdd 100644
--- a/source/include/smb.h
+++ b/source/include/smb.h
@@ -380,8 +380,7 @@ typedef struct
 
 #include "fake_file.h"
 
-typedef struct files_struct
-{
+typedef struct files_struct {
 	struct files_struct *next, *prev;
 	int fnum;
 	struct connection_struct *conn;