[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-401-g937a058

[Stefan Metzmacher]

The branch, master has been updated
   via  937a058cf25672bc22bf07183b0fb485138f6593 (commit)
  from  467cc6927f57e36ce9b97131e72b79ef6e39a668 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 937a058cf25672bc22bf07183b0fb485138f6593
Author: Stefan Metzmacher me...@samba.org
Date:   Tue Mar 17 08:58:04 2009 +0100

s4:build: use SAMBA_PKG_CONFIG_MIN_VERSION instead of PKG_CONFIG_MIN_VERSION

And also intialize the variable. This fixes ./autogen.sh
in the merged build for me.

metze

---

Summary of changes:
 source4/build/m4/public.m4 |5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4
index 6860e56..bd98a40 100644
--- a/source4/build/m4/public.m4
+++ b/source4/build/m4/public.m4
@@ -82,7 +82,8 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG],
echo *** Or see http://pkg-config.freedesktop.org/ to get 
pkg-config.
ac_cv_$1_found=no
else
-   if $PKG_CONFIG --atleast-pkgconfig-version 0.9.0; then
+   SAMBA_PKG_CONFIG_MIN_VERSION=0.9.0
+   if $PKG_CONFIG --atleast-pkgconfig-version 
$SAMBA_PKG_CONFIG_MIN_VERSION; then
AC_MSG_CHECKING(for $2)
 
if $PKG_CONFIG --exists '$2' ; then
@@ -114,7 +115,7 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG],
ac_cv_$1_found=no
fi
else
-   echo *** Your version of pkg-config is too old. You 
need version $PKG_CONFIG_MIN_VERSION or newer.
+   echo *** Your version of pkg-config is too old. You 
need version $SAMBA_PKG_CONFIG_MIN_VERSION or newer.
echo *** See http://pkg-config.freedesktop.org/;
ac_cv_$1_found=no
fi


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-372-g0918711

[Stefan Metzmacher]

The branch, v3-4-test has been updated
   via  0918711c8cfd69d751ac7d0ab553575c34ea8ff4 (commit)
  from  da2cd75615f72b1e3d138e0d374fea0998800355 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -
commit 0918711c8cfd69d751ac7d0ab553575c34ea8ff4
Author: Stefan Metzmacher me...@samba.org
Date:   Tue Mar 17 08:58:04 2009 +0100

s4:build: use SAMBA_PKG_CONFIG_MIN_VERSION instead of PKG_CONFIG_MIN_VERSION

And also intialize the variable. This fixes ./autogen.sh
in the merged build for me.

metze
(cherry picked from commit 937a058cf25672bc22bf07183b0fb485138f6593)

---

Summary of changes:
 source4/build/m4/public.m4 |5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4
index ffdf92f..b0b8af3 100644
--- a/source4/build/m4/public.m4
+++ b/source4/build/m4/public.m4
@@ -82,7 +82,8 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG],
echo *** Or see http://pkg-config.freedesktop.org/ to get 
pkg-config.
ac_cv_$1_found=no
else
-   if $PKG_CONFIG --atleast-pkgconfig-version 0.9.0; then
+   SAMBA_PKG_CONFIG_MIN_VERSION=0.9.0
+   if $PKG_CONFIG --atleast-pkgconfig-version 
$SAMBA_PKG_CONFIG_MIN_VERSION; then
AC_MSG_CHECKING(for $2)
 
if $PKG_CONFIG --exists '$2' ; then
@@ -112,7 +113,7 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG],
ac_cv_$1_found=no
fi
else
-   echo *** Your version of pkg-config is too old. You 
need version $PKG_CONFIG_MIN_VERSION or newer.
+   echo *** Your version of pkg-config is too old. You 
need version $SAMBA_PKG_CONFIG_MIN_VERSION or newer.
echo *** See http://pkg-config.freedesktop.org/;
ac_cv_$1_found=no
fi


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-403-g88ca3e1

[Günther Deschner]

The branch, master has been updated
   via  88ca3e17432c3a9efe30b122eea491400de4bdfc (commit)
   via  04fd767c0b244082f616b445558c80619ef0363f (commit)
  from  937a058cf25672bc22bf07183b0fb485138f6593 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 88ca3e17432c3a9efe30b122eea491400de4bdfc
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 01:40:32 2009 +0100

s3-spoolss: remove more unused defines.

Guenther

commit 04fd767c0b244082f616b445558c80619ef0363f
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 01:35:22 2009 +0100

s3-spoolss: remove obsolete get_a_builtin_ntform.

Guenther

---

Summary of changes:
 source3/include/proto.h|1 -
 source3/include/rpc_spoolss.h  |   31 ---
 source3/printing/nt_printing.c |7 ---
 3 files changed, 0 insertions(+), 39 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 6016ae7..c4f57af 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4793,7 +4793,6 @@ bool nt_printing_init(struct messaging_context *msg_ctx);
 uint32 update_c_setprinter(bool initialize);
 uint32 get_c_setprinter(void);
 int get_builtin_ntforms(nt_forms_struct **list);
-bool get_a_builtin_ntform(UNISTR2 *uni_formname,nt_forms_struct *form);
 bool get_a_builtin_ntform_by_string(const char *form_name, nt_forms_struct 
*form);
 int get_ntforms(nt_forms_struct **list);
 int write_ntforms(nt_forms_struct **list, int number);
diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index eb2fdd5..4530802 100644
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -274,23 +274,6 @@ typedef struct devicemode
 }
 DEVICEMODE;
 
-typedef struct _devmode_cont
-{
-   uint32 size;
-   uint32 devmode_ptr;
-   DEVICEMODE *devmode;
-}
-DEVMODE_CTR;
-
-typedef struct _printer_default
-{
-   uint32 datatype_ptr;
-   UNISTR2 datatype;
-   DEVMODE_CTR devmode_cont;
-   uint32 access_required;
-}
-PRINTER_DEFAULT;
-
 //
 
 typedef struct spool_q_getprinterdata
@@ -380,20 +363,6 @@ typedef struct spool_r_setprinterdata
 }
 SPOOL_R_SETPRINTERDATA;
 
-typedef struct _form
-{
-   uint32 flags;
-   uint32 name_ptr;
-   uint32 size_x;
-   uint32 size_y;
-   uint32 left;
-   uint32 top;
-   uint32 right;
-   uint32 bottom;
-   UNISTR2 name;
-}
-FORM;
-
 typedef struct spool_q_enumprinterkey
 {
POLICY_HND handle;
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index d8658e9..12e645f 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -789,13 +789,6 @@ bool get_a_builtin_ntform_by_string(const char *form_name, 
nt_forms_struct *form
return (i !=count);
 }
 
-bool get_a_builtin_ntform(UNISTR2 *uni_formname,nt_forms_struct *form)
-{
-   fstring form_name;
-   unistr2_to_ascii(form_name, uni_formname, sizeof(form_name));
-   return get_a_builtin_ntform_by_string(form_name, form);
-}
-
 /
  get a form struct list.
 /


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-374-gc33d62c

[Günther Deschner]

The branch, v3-4-test has been updated
   via  c33d62ca2aa6c470c3dce68920ba0e7f9cdb59b3 (commit)
   via  b0948127557fab056fc81144cbcb3fe077821c03 (commit)
  from  0918711c8cfd69d751ac7d0ab553575c34ea8ff4 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -
commit c33d62ca2aa6c470c3dce68920ba0e7f9cdb59b3
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 01:40:32 2009 +0100

s3-spoolss: remove more unused defines.

Guenther
(cherry picked from commit 88ca3e17432c3a9efe30b122eea491400de4bdfc)

commit b0948127557fab056fc81144cbcb3fe077821c03
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 01:35:22 2009 +0100

s3-spoolss: remove obsolete get_a_builtin_ntform.

Guenther
(cherry picked from commit 04fd767c0b244082f616b445558c80619ef0363f)

---

Summary of changes:
 source3/include/proto.h|1 -
 source3/include/rpc_spoolss.h  |   31 ---
 source3/printing/nt_printing.c |7 ---
 3 files changed, 0 insertions(+), 39 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 36aad98..9db9c40 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4793,7 +4793,6 @@ bool nt_printing_init(struct messaging_context *msg_ctx);
 uint32 update_c_setprinter(bool initialize);
 uint32 get_c_setprinter(void);
 int get_builtin_ntforms(nt_forms_struct **list);
-bool get_a_builtin_ntform(UNISTR2 *uni_formname,nt_forms_struct *form);
 bool get_a_builtin_ntform_by_string(const char *form_name, nt_forms_struct 
*form);
 int get_ntforms(nt_forms_struct **list);
 int write_ntforms(nt_forms_struct **list, int number);
diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index eb2fdd5..4530802 100644
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -274,23 +274,6 @@ typedef struct devicemode
 }
 DEVICEMODE;
 
-typedef struct _devmode_cont
-{
-   uint32 size;
-   uint32 devmode_ptr;
-   DEVICEMODE *devmode;
-}
-DEVMODE_CTR;
-
-typedef struct _printer_default
-{
-   uint32 datatype_ptr;
-   UNISTR2 datatype;
-   DEVMODE_CTR devmode_cont;
-   uint32 access_required;
-}
-PRINTER_DEFAULT;
-
 //
 
 typedef struct spool_q_getprinterdata
@@ -380,20 +363,6 @@ typedef struct spool_r_setprinterdata
 }
 SPOOL_R_SETPRINTERDATA;
 
-typedef struct _form
-{
-   uint32 flags;
-   uint32 name_ptr;
-   uint32 size_x;
-   uint32 size_y;
-   uint32 left;
-   uint32 top;
-   uint32 right;
-   uint32 bottom;
-   UNISTR2 name;
-}
-FORM;
-
 typedef struct spool_q_enumprinterkey
 {
POLICY_HND handle;
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index d8658e9..12e645f 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -789,13 +789,6 @@ bool get_a_builtin_ntform_by_string(const char *form_name, 
nt_forms_struct *form
return (i !=count);
 }
 
-bool get_a_builtin_ntform(UNISTR2 *uni_formname,nt_forms_struct *form)
-{
-   fstring form_name;
-   unistr2_to_ascii(form_name, uni_formname, sizeof(form_name));
-   return get_a_builtin_ntform_by_string(form_name, form);
-}
-
 /
  get a form struct list.
 /


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-405-g6df9e1f

[Günther Deschner]

The branch, master has been updated
   via  6df9e1f7aafe6da4b90271dda8d6cf3847a8d39e (commit)
   via  9a8f19672de6ec00bbd95a1a72e6ef2a79ed7d81 (commit)
  from  88ca3e17432c3a9efe30b122eea491400de4bdfc (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 6df9e1f7aafe6da4b90271dda8d6cf3847a8d39e
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 16:53:41 2009 +0100

s3-spoolss: add push_spoolss_PrinterData().

Guenther

commit 9a8f19672de6ec00bbd95a1a72e6ef2a79ed7d81
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 16:52:37 2009 +0100

s3-spoolss: add pull_spoolss_PrinterData().

Guenther

---

Summary of changes:
 source3/include/proto.h   |7 +++
 source3/rpc_client/init_spoolss.c |   33 +
 2 files changed, 40 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index c4f57af..f2929e8 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5554,6 +5554,13 @@ WERROR rpccli_spoolss_enumprinterkey(struct 
rpc_pipe_client *cli, TALLOC_CTX *me
 
 bool init_systemtime(struct spoolss_Time *r,
 struct tm *unixtime);
+WERROR pull_spoolss_PrinterData(TALLOC_CTX *mem_ctx,
+   const DATA_BLOB *blob,
+   union spoolss_PrinterData *data,
+   enum winreg_Type type);
+WERROR push_spoolss_PrinterData(TALLOC_CTX *mem_ctx, DATA_BLOB *blob,
+   enum winreg_Type type,
+   union spoolss_PrinterData *data);
 
 /* The following definitions come from rpc_client/init_lsa.c  */
 
diff --git a/source3/rpc_client/init_spoolss.c 
b/source3/rpc_client/init_spoolss.c
index a6255ad..4c105ea 100644
--- a/source3/rpc_client/init_spoolss.c
+++ b/source3/rpc_client/init_spoolss.c
@@ -40,3 +40,36 @@ bool init_systemtime(struct spoolss_Time *r,
 
return true;
 }
+
+/***
+ /
+
+WERROR pull_spoolss_PrinterData(TALLOC_CTX *mem_ctx,
+   const DATA_BLOB *blob,
+   union spoolss_PrinterData *data,
+   enum winreg_Type type)
+{
+   enum ndr_err_code ndr_err;
+   ndr_err = ndr_pull_union_blob(blob, mem_ctx, NULL, data, type,
+   (ndr_pull_flags_fn_t)ndr_pull_spoolss_PrinterData);
+   if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+   return WERR_GENERAL_FAILURE;
+   }
+   return WERR_OK;
+}
+
+/***
+ /
+
+WERROR push_spoolss_PrinterData(TALLOC_CTX *mem_ctx, DATA_BLOB *blob,
+   enum winreg_Type type,
+   union spoolss_PrinterData *data)
+{
+   enum ndr_err_code ndr_err;
+   ndr_err = ndr_push_union_blob(blob, mem_ctx, NULL, data, type,
+   (ndr_push_flags_fn_t)ndr_push_spoolss_PrinterData);
+   if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+   return WERR_GENERAL_FAILURE;
+   }
+   return WERR_OK;
+}


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-376-ga4063f8

[Günther Deschner]

The branch, v3-4-test has been updated
   via  a4063f80803d0751895baced8a3f4ef03431b2a1 (commit)
   via  08dfece15d7b071ec03059fff4851f9a91ae2e33 (commit)
  from  c33d62ca2aa6c470c3dce68920ba0e7f9cdb59b3 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -
commit a4063f80803d0751895baced8a3f4ef03431b2a1
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 16:53:41 2009 +0100

s3-spoolss: add push_spoolss_PrinterData().

Guenther
(cherry picked from commit 6df9e1f7aafe6da4b90271dda8d6cf3847a8d39e)

commit 08dfece15d7b071ec03059fff4851f9a91ae2e33
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 16:52:37 2009 +0100

s3-spoolss: add pull_spoolss_PrinterData().

Guenther
(cherry picked from commit 9a8f19672de6ec00bbd95a1a72e6ef2a79ed7d81)

---

Summary of changes:
 source3/include/proto.h   |7 +++
 source3/rpc_client/init_spoolss.c |   33 +
 2 files changed, 40 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 9db9c40..efafcc1 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5554,6 +5554,13 @@ WERROR rpccli_spoolss_enumprinterkey(struct 
rpc_pipe_client *cli, TALLOC_CTX *me
 
 bool init_systemtime(struct spoolss_Time *r,
 struct tm *unixtime);
+WERROR pull_spoolss_PrinterData(TALLOC_CTX *mem_ctx,
+   const DATA_BLOB *blob,
+   union spoolss_PrinterData *data,
+   enum winreg_Type type);
+WERROR push_spoolss_PrinterData(TALLOC_CTX *mem_ctx, DATA_BLOB *blob,
+   enum winreg_Type type,
+   union spoolss_PrinterData *data);
 
 /* The following definitions come from rpc_client/init_lsa.c  */
 
diff --git a/source3/rpc_client/init_spoolss.c 
b/source3/rpc_client/init_spoolss.c
index a6255ad..4c105ea 100644
--- a/source3/rpc_client/init_spoolss.c
+++ b/source3/rpc_client/init_spoolss.c
@@ -40,3 +40,36 @@ bool init_systemtime(struct spoolss_Time *r,
 
return true;
 }
+
+/***
+ /
+
+WERROR pull_spoolss_PrinterData(TALLOC_CTX *mem_ctx,
+   const DATA_BLOB *blob,
+   union spoolss_PrinterData *data,
+   enum winreg_Type type)
+{
+   enum ndr_err_code ndr_err;
+   ndr_err = ndr_pull_union_blob(blob, mem_ctx, NULL, data, type,
+   (ndr_pull_flags_fn_t)ndr_pull_spoolss_PrinterData);
+   if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+   return WERR_GENERAL_FAILURE;
+   }
+   return WERR_OK;
+}
+
+/***
+ /
+
+WERROR push_spoolss_PrinterData(TALLOC_CTX *mem_ctx, DATA_BLOB *blob,
+   enum winreg_Type type,
+   union spoolss_PrinterData *data)
+{
+   enum ndr_err_code ndr_err;
+   ndr_err = ndr_push_union_blob(blob, mem_ctx, NULL, data, type,
+   (ndr_push_flags_fn_t)ndr_push_spoolss_PrinterData);
+   if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+   return WERR_GENERAL_FAILURE;
+   }
+   return WERR_OK;
+}


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-418-g0e2139c

[Günther Deschner]

The branch, master has been updated
   via  0e2139c6936b28015a8a2a539810c2bd7821d36f (commit)
   via  4727e3fa9784b183d223cd0779b6748f9916a538 (commit)
   via  67599539063ff1d797886ea4097c59760e8ecbc5 (commit)
   via  849254d24c3d38326f7dbe80babb21a7fe47aedb (commit)
   via  28c6f1fb4734b6285e7684ec27f62481371a8654 (commit)
   via  b560a99718a4c9d448c4d482486da127362db50a (commit)
   via  2ec1f850e3fc565e7830b94575eeafde18a37d27 (commit)
   via  2b0a0b25e21f8149e242fb74816c62da470a3e8a (commit)
   via  be9a34e75d03ca09b4d57c57f59f83d4214c7754 (commit)
   via  c6e3e5eabc6de32117ce7d5403948e9ab739e4eb (commit)
   via  e56be5cf847e758794687706a5f2ba4261b0c270 (commit)
   via  4de3a46c8626d4efb3479af0427edb82fc0aa34d (commit)
   via  92e6525ae124c97d31a46b9fe3d6d1415c219e9f (commit)
  from  6df9e1f7aafe6da4b90271dda8d6cf3847a8d39e (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 0e2139c6936b28015a8a2a539810c2bd7821d36f
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 16:01:10 2009 +0100

s4-smbtorture: fix RPC-SPOOLSS test after PrinterData changes.

Guenther

commit 4727e3fa9784b183d223cd0779b6748f9916a538
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 15:44:16 2009 +0100

s4-spoolss: use winreg_Type for GetPrinterData implementation.

Guenther

commit 67599539063ff1d797886ea4097c59760e8ecbc5
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 16:45:57 2009 +0100

s3: re-run make samba3-idl.

Guenther

commit 849254d24c3d38326f7dbe80babb21a7fe47aedb
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 15:43:17 2009 +0100

spoolss: use winreg_Type instead of spoolss_PrinterDataType for 
XPrinterData calls.

Guenther

commit 28c6f1fb4734b6285e7684ec27f62481371a8654
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 15:22:59 2009 +0100

spoolss: use uint8 array instead of DATA_BLOB in EnumPrinterData IDL out 
pointer.

Guenther

commit b560a99718a4c9d448c4d482486da127362db50a
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 01:39:39 2009 +0100

spoolss: fix ndr_push_spoolss_SetPrinterData.

Guenther

commit 2ec1f850e3fc565e7830b94575eeafde18a37d27
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 03:01:30 2009 +0100

s3: re-run make samba3-idl.

Guenther

commit 2b0a0b25e21f8149e242fb74816c62da470a3e8a
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 01:39:16 2009 +0100

spoolss: fix IDL for spoolss_SetPrinterData.

Guenther

commit be9a34e75d03ca09b4d57c57f59f83d4214c7754
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 01:38:08 2009 +0100

s4-spoolss: fix spoolss_GetPrinterData w.r.t. out pointer changes.

Guenther

commit c6e3e5eabc6de32117ce7d5403948e9ab739e4eb
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 01:36:31 2009 +0100

s4-smbtorture: fix test_GetPrinterData tests after out pointer changes.

Guenther

commit e56be5cf847e758794687706a5f2ba4261b0c270
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 01:34:39 2009 +0100

spoolss: fix GetPrinterData buffer helper.

Guenther

commit 4de3a46c8626d4efb3479af0427edb82fc0aa34d
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 03:00:51 2009 +0100

s3: re-run make samba3-idl.

Guenther

commit 92e6525ae124c97d31a46b9fe3d6d1415c219e9f
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 01:33:41 2009 +0100

spoolss: make spoolss_GetPrinterData out.data ref pointers.

Guenther

---

Summary of changes:
 librpc/gen_ndr/cli_spoolss.c|   20 ++--
 librpc/gen_ndr/cli_spoolss.h|   14 +-
 librpc/gen_ndr/ndr_spoolss.c|  221 ++-
 librpc/gen_ndr/ndr_spoolss.h|1 -
 librpc/gen_ndr/spoolss.h|   55 +++-
 librpc/gen_ndr/srv_spoolss.c|   35 +++--
 librpc/idl/spoolss.idl  |   46 +++
 librpc/ndr/ndr_spoolss_buf.c|   30 +++--
 source4/ntptr/simple_ldb/ntptr_simple_ldb.c |   54 
 source4/rpc_server/spoolss/dcesrv_spoolss.c |   12 +-
 source4/torture/rpc/spoolss.c   |   17 ++-
 source4/torture/rpc/spoolss_win.c   |6 +-
 12 files changed, 263 insertions(+), 248 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/gen_ndr/cli_spoolss.c b/librpc/gen_ndr/cli_spoolss.c
index 2e0582e..54346b5 100644
--- a/librpc/gen_ndr/cli_spoolss.c
+++ b/librpc/gen_ndr/cli_spoolss.c
@@ -1302,8 +1302,8 @@ NTSTATUS rpccli_spoolss_GetPrinterData(struct 
rpc_pipe_client *cli,
   struct policy_handle *handle /* [in] 
[ref] */,
  

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-419-g7735650

[Volker Lendecke]

The branch, master has been updated
   via  7735650f2ed74a72ddee272baf281e3fd9e7c42b (commit)
  from  0e2139c6936b28015a8a2a539810c2bd7821d36f (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 7735650f2ed74a72ddee272baf281e3fd9e7c42b
Author: Volker Lendecke v...@samba.org
Date:   Tue Mar 17 11:22:41 2009 +0100

Fix a valgrind error

Found in make test -- if we can't connect at all, cli is uninitialized

---

Summary of changes:
 source3/winbindd/winbindd_cm.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index e06e30e..d595f80 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -1772,7 +1772,7 @@ static void set_dc_type_and_flags_connect( struct 
winbindd_domain *domain )
NTSTATUSresult;
WERROR werr;
TALLOC_CTX  *mem_ctx = NULL;
-   struct rpc_pipe_client  *cli;
+   struct rpc_pipe_client  *cli = NULL;
POLICY_HND pol;
union dssetup_DsRoleInfo info;
union lsa_PolicyInformation *lsa_info = NULL;


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-377-ga6b0963

[Volker Lendecke]

The branch, v3-4-test has been updated
   via  a6b0963d718d792f7b4cb218f6a070715ec7a091 (commit)
  from  a4063f80803d0751895baced8a3f4ef03431b2a1 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -
commit a6b0963d718d792f7b4cb218f6a070715ec7a091
Author: Volker Lendecke v...@samba.org
Date:   Tue Mar 17 11:22:41 2009 +0100

Fix a valgrind error

Found in make test -- if we can't connect at all, cli is uninitialized
(cherry picked from commit 7735650f2ed74a72ddee272baf281e3fd9e7c42b)

---

Summary of changes:
 source3/winbindd/winbindd_cm.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index e06e30e..d595f80 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -1772,7 +1772,7 @@ static void set_dc_type_and_flags_connect( struct 
winbindd_domain *domain )
NTSTATUSresult;
WERROR werr;
TALLOC_CTX  *mem_ctx = NULL;
-   struct rpc_pipe_client  *cli;
+   struct rpc_pipe_client  *cli = NULL;
POLICY_HND pol;
union dssetup_DsRoleInfo info;
union lsa_PolicyInformation *lsa_info = NULL;


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5069-gc863f8c

[Volker Lendecke]

The branch, v3-3-test has been updated
   via  c863f8c767c9112a31da7b9f8a84c6c07bfb9d37 (commit)
  from  3751ea72f225e370c52b842f258a828ff4a596fd (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -
commit c863f8c767c9112a31da7b9f8a84c6c07bfb9d37
Author: Volker Lendecke v...@samba.org
Date:   Tue Mar 17 11:22:41 2009 +0100

Fix a valgrind error

Found in make test -- if we can't connect at all, cli is uninitialized

---

Summary of changes:
 source/winbindd/winbindd_cm.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/winbindd/winbindd_cm.c b/source/winbindd/winbindd_cm.c
index ddd98c3..bc3db08 100644
--- a/source/winbindd/winbindd_cm.c
+++ b/source/winbindd/winbindd_cm.c
@@ -1763,7 +1763,7 @@ static void set_dc_type_and_flags_connect( struct 
winbindd_domain *domain )
NTSTATUSresult;
WERROR werr;
TALLOC_CTX  *mem_ctx = NULL;
-   struct rpc_pipe_client  *cli;
+   struct rpc_pipe_client  *cli = NULL;
POLICY_HND pol;
union dssetup_DsRoleInfo info;
union lsa_PolicyInformation *lsa_info = NULL;


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-391-g2e91b3a

[Günther Deschner]

The branch, v3-4-test has been updated
   via  2e91b3abbe9cb2451ed363d98e987f8ed89ed63b (commit)
   via  adaf2d1554c55c80b259bc02f11d670acb5ab0d0 (commit)
   via  f8ca8f50e43be297b148bc091b179fb656c82456 (commit)
   via  1158eaa5c56908b8ba87283dd8cc1669040ec918 (commit)
   via  305b97fa8d79ce99c2672429e92e32114b34d946 (commit)
   via  8cb33c54922b489d20a62ff3ede7288e181f3062 (commit)
   via  a32f227e31fa6fed9f935b6686c9289ee574c0aa (commit)
   via  65d023dc5fcaa397670c176ca287f8e5cc6c17f7 (commit)
   via  ea68c717083cac063da0fd1f321f39ba72067212 (commit)
   via  4aa8510e8f300b677c7e2b367e6768946d44ed75 (commit)
   via  de3971c6f4818ed2bcbe2fddf1f81c29bdb31061 (commit)
   via  fa7ff3228085fd449c23055d2116238ece158196 (commit)
   via  8f13a06f5ebc203a5c540b8fc83f2315cab2b9a2 (commit)
   via  8a9f1cf71d9b74a272612bf82f27c2f18766d136 (commit)
  from  a6b0963d718d792f7b4cb218f6a070715ec7a091 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -
commit 2e91b3abbe9cb2451ed363d98e987f8ed89ed63b
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 16:01:10 2009 +0100

s4-smbtorture: fix RPC-SPOOLSS test after PrinterData changes.

Guenther
(cherry picked from commit 0e2139c6936b28015a8a2a539810c2bd7821d36f)

commit adaf2d1554c55c80b259bc02f11d670acb5ab0d0
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 15:44:16 2009 +0100

s4-spoolss: use winreg_Type for GetPrinterData implementation.

Guenther
(cherry picked from commit 4727e3fa9784b183d223cd0779b6748f9916a538)

commit f8ca8f50e43be297b148bc091b179fb656c82456
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 16:45:57 2009 +0100

s3: re-run make samba3-idl.

Guenther
(cherry picked from commit 67599539063ff1d797886ea4097c59760e8ecbc5)

commit 1158eaa5c56908b8ba87283dd8cc1669040ec918
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 15:43:17 2009 +0100

spoolss: use winreg_Type instead of spoolss_PrinterDataType for 
XPrinterData calls.

Guenther
(cherry picked from commit 849254d24c3d38326f7dbe80babb21a7fe47aedb)

commit 305b97fa8d79ce99c2672429e92e32114b34d946
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 15:22:59 2009 +0100

spoolss: use uint8 array instead of DATA_BLOB in EnumPrinterData IDL out 
pointer.

Guenther
(cherry picked from commit 28c6f1fb4734b6285e7684ec27f62481371a8654)

commit 8cb33c54922b489d20a62ff3ede7288e181f3062
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 01:39:39 2009 +0100

spoolss: fix ndr_push_spoolss_SetPrinterData.

Guenther
(cherry picked from commit b560a99718a4c9d448c4d482486da127362db50a)

commit a32f227e31fa6fed9f935b6686c9289ee574c0aa
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 03:01:30 2009 +0100

s3: re-run make samba3-idl.

Guenther
(cherry picked from commit 2ec1f850e3fc565e7830b94575eeafde18a37d27)

commit 65d023dc5fcaa397670c176ca287f8e5cc6c17f7
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 01:39:16 2009 +0100

spoolss: fix IDL for spoolss_SetPrinterData.

Guenther
(cherry picked from commit 2b0a0b25e21f8149e242fb74816c62da470a3e8a)

commit ea68c717083cac063da0fd1f321f39ba72067212
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 01:38:08 2009 +0100

s4-spoolss: fix spoolss_GetPrinterData w.r.t. out pointer changes.

Guenther
(cherry picked from commit be9a34e75d03ca09b4d57c57f59f83d4214c7754)

commit 4aa8510e8f300b677c7e2b367e6768946d44ed75
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 01:36:31 2009 +0100

s4-smbtorture: fix test_GetPrinterData tests after out pointer changes.

Guenther
(cherry picked from commit c6e3e5eabc6de32117ce7d5403948e9ab739e4eb)

commit de3971c6f4818ed2bcbe2fddf1f81c29bdb31061
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 01:34:39 2009 +0100

spoolss: fix GetPrinterData buffer helper.

Guenther
(cherry picked from commit e56be5cf847e758794687706a5f2ba4261b0c270)

commit fa7ff3228085fd449c23055d2116238ece158196
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 03:00:51 2009 +0100

s3: re-run make samba3-idl.

Guenther
(cherry picked from commit 4de3a46c8626d4efb3479af0427edb82fc0aa34d)

commit 8f13a06f5ebc203a5c540b8fc83f2315cab2b9a2
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 01:33:41 2009 +0100

spoolss: make spoolss_GetPrinterData out.data ref pointers.

Guenther
(cherry picked from commit 92e6525ae124c97d31a46b9fe3d6d1415c219e9f)

commit 8a9f1cf71d9b74a272612bf82f27c2f18766d136
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 01:36:01 2009 +0100

s4-smbtorture: fix build warning in test_EnumPrintProcDataTypes.

Guenther
(cherry picked from commit 

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-425-g6dca805

[Günther Deschner]

The branch, master has been updated
   via  6dca80518dda120753112204eaaae7961938bb9e (commit)
   via  aeba6381d3e0ee7f3983d8be4dcdfa0f1015d3ee (commit)
   via  d77cc437841ea97d350898d36faa0ee2534eceaa (commit)
   via  704220c2a240498f1ac4be8854c5ea4fe8958a9f (commit)
   via  08d170abc12b72e027b80f22b11213346fb6cf7e (commit)
   via  754d136c32372cb9dd604375b98379d9696fb48f (commit)
  from  7735650f2ed74a72ddee272baf281e3fd9e7c42b (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 6dca80518dda120753112204eaaae7961938bb9e
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 01:31:00 2009 +0100

s3-spoolss: remove old spoolss_GetPrinterData.

Guenther

commit aeba6381d3e0ee7f3983d8be4dcdfa0f1015d3ee
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 01:29:56 2009 +0100

s3-spoolss: use pidl for _spoolss_GetPrinterData.

Guenther

commit d77cc437841ea97d350898d36faa0ee2534eceaa
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 01:28:25 2009 +0100

s3-spoolss: remove old rpccli_spoolss_getprinterdata.

Guenther

commit 704220c2a240498f1ac4be8854c5ea4fe8958a9f
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 01:28:55 2009 +0100

s3-rpcclient: use rpccli_spoolss_getprinterdata.

Guenther

commit 08d170abc12b72e027b80f22b11213346fb6cf7e
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 01:26:27 2009 +0100

s3-spoolss: add rpccli_spoolss_getprinterdata convenience wrapper.

Guenther

commit 754d136c32372cb9dd604375b98379d9696fb48f
Author: Günther Deschner g...@samba.org
Date:   Thu Feb 26 21:56:12 2009 +0100

s3-spoolss: remove unused ADD_JOBINFO_1.

Guenther

---

Summary of changes:
 source3/include/proto.h |   16 +--
 source3/include/rpc_spoolss.h   |   28 
 source3/rpc_client/cli_spoolss.c|   84 +---
 source3/rpc_parse/parse_spoolss.c   |   88 
 source3/rpc_server/srv_spoolss.c|   23 +---
 source3/rpc_server/srv_spoolss_nt.c |  261 ++-
 source3/rpcclient/cmd_spoolss.c |   63 -
 7 files changed, 206 insertions(+), 357 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index f2929e8..23a6c77 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5533,9 +5533,13 @@ WERROR rpccli_spoolss_enumprinters(struct 
rpc_pipe_client *cli,
   uint32_t offered,
   uint32_t *count,
   union spoolss_PrinterInfo **info);
-WERROR rpccli_spoolss_getprinterdata(struct rpc_pipe_client *cli, TALLOC_CTX 
*mem_ctx,
- POLICY_HND *hnd, const char *valuename, 
- REGISTRY_VALUE *value);
+WERROR rpccli_spoolss_getprinterdata(struct rpc_pipe_client *cli,
+TALLOC_CTX *mem_ctx,
+struct policy_handle *handle,
+const char *value_name,
+uint32_t offered,
+enum winreg_Type *type,
+union spoolss_PrinterData *data);
 WERROR rpccli_spoolss_setprinterdata(struct rpc_pipe_client *cli, TALLOC_CTX 
*mem_ctx,
  POLICY_HND *hnd, REGISTRY_VALUE *value);
 WERROR rpccli_spoolss_enumprinterdata(struct rpc_pipe_client *cli, TALLOC_CTX 
*mem_ctx,
@@ -5842,11 +5846,6 @@ bool sec_io_desc_buf(const char *desc, SEC_DESC_BUF 
**ppsdb, prs_struct *ps, int
 bool spoolss_io_system_time(const char *desc, prs_struct *ps, int depth, 
SYSTEMTIME *systime);
 bool make_systemtime(SYSTEMTIME *systime, struct tm *unixtime);
 bool spoolss_io_devmode(const char *desc, prs_struct *ps, int depth, 
DEVICEMODE *devmode);
-bool make_spoolss_q_getprinterdata(SPOOL_Q_GETPRINTERDATA *q_u,
-  const POLICY_HND *handle,
-  const char *valuename, uint32 size);
-bool spoolss_io_q_getprinterdata(const char *desc, SPOOL_Q_GETPRINTERDATA 
*q_u, prs_struct *ps, int depth);
-bool spoolss_io_r_getprinterdata(const char *desc, SPOOL_R_GETPRINTERDATA 
*r_u, prs_struct *ps, int depth);
 uint32 spoolss_size_printer_enum_values(PRINTER_ENUM_VALUES *p);
 bool make_spoolss_buffer5(TALLOC_CTX *mem_ctx, BUFFER5 *buf5, uint32 len, 
uint16 *src);
 bool spoolss_io_r_enumprinterdata(const char *desc, SPOOL_R_ENUMPRINTERDATA 
*r_u, prs_struct *ps, int depth);
@@ -5992,7 +5991,6 @@ bool convert_devicemode(const char *printername, const 
DEVICEMODE *devmode,
NT_DEVICEMODE **pp_nt_devmode);
 WERROR set_printer_dataex( NT_PRINTER_INFO_LEVEL 

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-397-gcab93fe

[Günther Deschner]

The branch, v3-4-test has been updated
   via  cab93fe1a22bf6212384a0df48b8ed91d0fdc239 (commit)
   via  3ca6148da0d33073799e68e5a969d02c8d7b91d3 (commit)
   via  207f7180887456b8ed5ad07e50d3e6bcf5774d32 (commit)
   via  22411a7fe2459af77bcaab21b307698f0f5da1bd (commit)
   via  ce798967b603adb39fc1b612888713b3160b11c0 (commit)
   via  82b35cdcff42a66d200abd84af10b5f682dd66b6 (commit)
  from  2e91b3abbe9cb2451ed363d98e987f8ed89ed63b (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -
commit cab93fe1a22bf6212384a0df48b8ed91d0fdc239
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 01:31:00 2009 +0100

s3-spoolss: remove old spoolss_GetPrinterData.

Guenther
(cherry picked from commit 6dca80518dda120753112204eaaae7961938bb9e)

commit 3ca6148da0d33073799e68e5a969d02c8d7b91d3
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 01:29:56 2009 +0100

s3-spoolss: use pidl for _spoolss_GetPrinterData.

Guenther
(cherry picked from commit aeba6381d3e0ee7f3983d8be4dcdfa0f1015d3ee)

commit 207f7180887456b8ed5ad07e50d3e6bcf5774d32
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 01:28:25 2009 +0100

s3-spoolss: remove old rpccli_spoolss_getprinterdata.

Guenther
(cherry picked from commit d77cc437841ea97d350898d36faa0ee2534eceaa)

commit 22411a7fe2459af77bcaab21b307698f0f5da1bd
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 01:28:55 2009 +0100

s3-rpcclient: use rpccli_spoolss_getprinterdata.

Guenther
(cherry picked from commit 704220c2a240498f1ac4be8854c5ea4fe8958a9f)

commit ce798967b603adb39fc1b612888713b3160b11c0
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 01:26:27 2009 +0100

s3-spoolss: add rpccli_spoolss_getprinterdata convenience wrapper.

Guenther
(cherry picked from commit 08d170abc12b72e027b80f22b11213346fb6cf7e)

commit 82b35cdcff42a66d200abd84af10b5f682dd66b6
Author: Günther Deschner g...@samba.org
Date:   Thu Feb 26 21:56:12 2009 +0100

s3-spoolss: remove unused ADD_JOBINFO_1.

Guenther
(cherry picked from commit 754d136c32372cb9dd604375b98379d9696fb48f)

---

Summary of changes:
 source3/include/proto.h |   16 +--
 source3/include/rpc_spoolss.h   |   28 
 source3/rpc_client/cli_spoolss.c|   84 +---
 source3/rpc_parse/parse_spoolss.c   |   88 
 source3/rpc_server/srv_spoolss.c|   23 +---
 source3/rpc_server/srv_spoolss_nt.c |  261 ++-
 source3/rpcclient/cmd_spoolss.c |   63 -
 7 files changed, 206 insertions(+), 357 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index efafcc1..52cab7c 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5533,9 +5533,13 @@ WERROR rpccli_spoolss_enumprinters(struct 
rpc_pipe_client *cli,
   uint32_t offered,
   uint32_t *count,
   union spoolss_PrinterInfo **info);
-WERROR rpccli_spoolss_getprinterdata(struct rpc_pipe_client *cli, TALLOC_CTX 
*mem_ctx,
- POLICY_HND *hnd, const char *valuename, 
- REGISTRY_VALUE *value);
+WERROR rpccli_spoolss_getprinterdata(struct rpc_pipe_client *cli,
+TALLOC_CTX *mem_ctx,
+struct policy_handle *handle,
+const char *value_name,
+uint32_t offered,
+enum winreg_Type *type,
+union spoolss_PrinterData *data);
 WERROR rpccli_spoolss_setprinterdata(struct rpc_pipe_client *cli, TALLOC_CTX 
*mem_ctx,
  POLICY_HND *hnd, REGISTRY_VALUE *value);
 WERROR rpccli_spoolss_enumprinterdata(struct rpc_pipe_client *cli, TALLOC_CTX 
*mem_ctx,
@@ -5842,11 +5846,6 @@ bool sec_io_desc_buf(const char *desc, SEC_DESC_BUF 
**ppsdb, prs_struct *ps, int
 bool spoolss_io_system_time(const char *desc, prs_struct *ps, int depth, 
SYSTEMTIME *systime);
 bool make_systemtime(SYSTEMTIME *systime, struct tm *unixtime);
 bool spoolss_io_devmode(const char *desc, prs_struct *ps, int depth, 
DEVICEMODE *devmode);
-bool make_spoolss_q_getprinterdata(SPOOL_Q_GETPRINTERDATA *q_u,
-  const POLICY_HND *handle,
-  const char *valuename, uint32 size);
-bool spoolss_io_q_getprinterdata(const char *desc, SPOOL_Q_GETPRINTERDATA 
*q_u, prs_struct *ps, int depth);
-bool spoolss_io_r_getprinterdata(const char *desc, SPOOL_R_GETPRINTERDATA 
*r_u, prs_struct *ps, int depth);
 uint32 

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-436-gacf523a

[Günther Deschner]

The branch, master has been updated
   via  acf523ad7edcde788ee79144928d74d91f0e0754 (commit)
   via  2a8c078357dd7bd191d0f2c55d94834c4774ecfc (commit)
   via  ead6a49218845fb7aa8f16147b6787c8811d4b10 (commit)
   via  80ecd11050061c6af30ff770e58af2f1a8291806 (commit)
   via  57077f43a73cfca9b3ae6ea03ebe457925e4c232 (commit)
   via  3e16ede0c2c73134201948e4018f6acefdca039c (commit)
  from  4ea46d69bbb7651b213c5b0674f4f9fb05059acd (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit acf523ad7edcde788ee79144928d74d91f0e0754
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 00:34:59 2009 +0100

s3-net: fix net_spoolss_setprinterdata.

Guenther

commit 2a8c078357dd7bd191d0f2c55d94834c4774ecfc
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 01:47:40 2009 +0100

s3-net: use rpccli_spoolss_EnumPrinterData.

Guenther

commit ead6a49218845fb7aa8f16147b6787c8811d4b10
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 15:04:17 2009 +0100

s3-spoolss: remove spoolss_EnumPrinterData.

Guenther

commit 80ecd11050061c6af30ff770e58af2f1a8291806
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 14:58:55 2009 +0100

s3-spoolss: use pidl for _spoolss_EnumPrinterData.

Guenther

commit 57077f43a73cfca9b3ae6ea03ebe457925e4c232
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 15:02:43 2009 +0100

s3-spoolss: remove rpccli_spoolss_enumprinterdata.

Guenther

commit 3e16ede0c2c73134201948e4018f6acefdca039c
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 15:11:04 2009 +0100

s3-rpcclient: use rpccli_spoolss_EnumPrinterData in enumdata command.

Guenther

---

Summary of changes:
 source3/include/proto.h |   11 ---
 source3/include/rpc_spoolss.h   |   22 --
 source3/rpc_client/cli_spoolss.c|   49 
 source3/rpc_parse/parse_spoolss.c   |   94 ---
 source3/rpc_server/srv_spoolss.c|   22 +-
 source3/rpc_server/srv_spoolss_nt.c |  140 ---
 source3/rpcclient/cmd_spoolss.c |   76 ++-
 source3/utils/net_rpc_printer.c |   95 ++--
 8 files changed, 180 insertions(+), 329 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 04f5997..e73237d 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5540,11 +5540,6 @@ WERROR rpccli_spoolss_getprinterdata(struct 
rpc_pipe_client *cli,
 uint32_t offered,
 enum winreg_Type *type,
 union spoolss_PrinterData *data);
-WERROR rpccli_spoolss_enumprinterdata(struct rpc_pipe_client *cli, TALLOC_CTX 
*mem_ctx,
-  POLICY_HND *hnd, uint32 ndx,
-  uint32 value_offered, uint32 data_offered,
-  uint32 *value_needed, uint32 *data_needed,
-  REGISTRY_VALUE *value);
 WERROR rpccli_spoolss_enumprinterdataex(struct rpc_pipe_client *cli, 
TALLOC_CTX *mem_ctx,
 POLICY_HND *hnd, const char *keyname, 
 REGVAL_CTR *ctr);
@@ -5846,11 +5841,6 @@ bool make_systemtime(SYSTEMTIME *systime, struct tm 
*unixtime);
 bool spoolss_io_devmode(const char *desc, prs_struct *ps, int depth, 
DEVICEMODE *devmode);
 uint32 spoolss_size_printer_enum_values(PRINTER_ENUM_VALUES *p);
 bool make_spoolss_buffer5(TALLOC_CTX *mem_ctx, BUFFER5 *buf5, uint32 len, 
uint16 *src);
-bool spoolss_io_r_enumprinterdata(const char *desc, SPOOL_R_ENUMPRINTERDATA 
*r_u, prs_struct *ps, int depth);
-bool spoolss_io_q_enumprinterdata(const char *desc, SPOOL_Q_ENUMPRINTERDATA 
*q_u, prs_struct *ps, int depth);
-bool make_spoolss_q_enumprinterdata(SPOOL_Q_ENUMPRINTERDATA *q_u,
-   const POLICY_HND *hnd,
-   uint32 idx, uint32 valuelen, uint32 datalen);
 bool make_spoolss_q_enumprinterdataex(SPOOL_Q_ENUMPRINTERDATAEX *q_u,
  const POLICY_HND *hnd, const char *key,
  uint32 size);
@@ -6060,7 +6050,6 @@ struct spoolss_DeviceMode 
*construct_dev_mode_new(TALLOC_CTX *mem_ctx,
 WERROR add_port_hook(TALLOC_CTX *ctx, NT_USER_TOKEN *token, const char 
*portname, const char *uri );
 bool add_printer_hook(TALLOC_CTX *ctx, NT_USER_TOKEN *token, 
NT_PRINTER_INFO_LEVEL *printer);
 WERROR enumports_hook(TALLOC_CTX *ctx, int *count, char ***lines );
-WERROR _spoolss_enumprinterdata(pipes_struct *p, SPOOL_Q_ENUMPRINTERDATA *q_u, 
SPOOL_R_ENUMPRINTERDATA *r_u);
 WERROR _spoolss_enumprinterkey(pipes_struct *p, SPOOL_Q_ENUMPRINTERKEY *q_u, 

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-408-g4aa6b49

[Günther Deschner]

The branch, v3-4-test has been updated
   via  4aa6b49f2d01594d795cc79c8de37121f7f6e5a9 (commit)
   via  d45e83e76a68928feec0a5958c06ffa2a32d776b (commit)
   via  a044cbeb5dc55f188d8e8e3abea5f6b59cae9a52 (commit)
   via  bed498fb2136215c734b4f4a60f557efe83b4ee2 (commit)
   via  300a7fdcf17c0321259f700c58dc8d8b4823886d (commit)
   via  77560e2c880e5e21593d7437443f9189d5e938a3 (commit)
   via  6a4d14132e10df43404d3008cc67ffd7d1ba71b2 (commit)
   via  e7e36c5a9f9ab8ea84b2138435458783df8d4faf (commit)
   via  8dc5c91c300c1fa8508097ee3f5dd92c3a77a2f1 (commit)
   via  dd1b4ee5031af6d3896a02ccf107346a470c9d36 (commit)
   via  1d07e5af1f52cdf6fb0f7ffea84ac67ff596986d (commit)
  from  cab93fe1a22bf6212384a0df48b8ed91d0fdc239 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -
commit 4aa6b49f2d01594d795cc79c8de37121f7f6e5a9
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 00:34:59 2009 +0100

s3-net: fix net_spoolss_setprinterdata.

Guenther
(cherry picked from commit acf523ad7edcde788ee79144928d74d91f0e0754)

commit d45e83e76a68928feec0a5958c06ffa2a32d776b
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 01:47:40 2009 +0100

s3-net: use rpccli_spoolss_EnumPrinterData.

Guenther
(cherry picked from commit 2a8c078357dd7bd191d0f2c55d94834c4774ecfc)

commit a044cbeb5dc55f188d8e8e3abea5f6b59cae9a52
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 15:04:17 2009 +0100

s3-spoolss: remove spoolss_EnumPrinterData.

Guenther
(cherry picked from commit ead6a49218845fb7aa8f16147b6787c8811d4b10)

commit bed498fb2136215c734b4f4a60f557efe83b4ee2
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 14:58:55 2009 +0100

s3-spoolss: use pidl for _spoolss_EnumPrinterData.

Guenther
(cherry picked from commit 80ecd11050061c6af30ff770e58af2f1a8291806)

commit 300a7fdcf17c0321259f700c58dc8d8b4823886d
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 15:02:43 2009 +0100

s3-spoolss: remove rpccli_spoolss_enumprinterdata.

Guenther
(cherry picked from commit 57077f43a73cfca9b3ae6ea03ebe457925e4c232)

commit 77560e2c880e5e21593d7437443f9189d5e938a3
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 15:11:04 2009 +0100

s3-rpcclient: use rpccli_spoolss_EnumPrinterData in enumdata command.

Guenther
(cherry picked from commit 3e16ede0c2c73134201948e4018f6acefdca039c)

commit 6a4d14132e10df43404d3008cc67ffd7d1ba71b2
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 12:01:29 2009 +0100

s3-net: temporary disable net_spoolss_setprinterdata.

Guenther
(cherry picked from commit 4ea46d69bbb7651b213c5b0674f4f9fb05059acd)

commit e7e36c5a9f9ab8ea84b2138435458783df8d4faf
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 02:26:08 2009 +0100

s3-spoolss: remove old spoolss_SetPrinterData.

Guenther
(cherry picked from commit 628c12e53b68e34fa3744f57619aa5351d2519c9)

commit 8dc5c91c300c1fa8508097ee3f5dd92c3a77a2f1
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 02:24:47 2009 +0100

s3-spoolss: use pidl for _spoolss_SetPrinterData.

Guenther
(cherry picked from commit f9871a846dcac079e33a9478fad5e3491a51e168)

commit dd1b4ee5031af6d3896a02ccf107346a470c9d36
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 02:22:59 2009 +0100

s3-spoolss: remove old rpccli_spoolss_setprinterdata wrapper.

Guenther
(cherry picked from commit 4234969df7fa973ee798bb656883a75d794006d6)

commit 1d07e5af1f52cdf6fb0f7ffea84ac67ff596986d
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 02:21:11 2009 +0100

s3-rpcclient: use rpccli_spoolss_SetPrinterData.

Guenther
(cherry picked from commit b8a3e5ea0c8cc6b6b3ad6eda088673e1c8027caf)

---

Summary of changes:
 source3/include/proto.h |   18 ---
 source3/include/rpc_spoolss.h   |   40 --
 source3/rpc_client/cli_spoolss.c|   75 ---
 source3/rpc_parse/parse_spoolss.c   |  174 --
 source3/rpc_server/srv_spoolss.c|   44 +---
 source3/rpc_server/srv_spoolss_nt.c |  232 ++-
 source3/rpcclient/cmd_spoolss.c |  187 
 source3/utils/net_rpc_printer.c |   92 +++---
 8 files changed, 271 insertions(+), 591 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 52cab7c..725f498 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5540,13 +5540,6 @@ WERROR rpccli_spoolss_getprinterdata(struct 
rpc_pipe_client *cli,
 uint32_t offered,
 enum winreg_Type *type,
  

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-449-g338c610

[Günther Deschner]

The branch, master has been updated
   via  338c61060b0af1a959cfd77e4d015853a7f09bfb (commit)
   via  63d78712bc11df175bc8cb3b53f1e413211d7248 (commit)
   via  846b93f54f551a03dcca73c808751900e405e304 (commit)
   via  e0c50aafce59ad4f4275ff91defb14ea44f42a65 (commit)
   via  bc95ec04e6b555b1dd2ce9d253c5a3fc3f095443 (commit)
   via  86c25b353381179ee392841618c9ae34dca1d992 (commit)
  from  87d97ad0422c771ea575e9a5e68d0d2e5bfe25be (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 338c61060b0af1a959cfd77e4d015853a7f09bfb
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 23:10:35 2009 +0100

s3-spoolss: remove old spoolss_EnumPrinterKey.

Guenther

commit 63d78712bc11df175bc8cb3b53f1e413211d7248
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 23:09:15 2009 +0100

s3-spoolss: use pidl for _spoolss_EnumPrinterKey.

Guenther

commit 846b93f54f551a03dcca73c808751900e405e304
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 22:09:22 2009 +0100

s3-spoolss: remove old rpccli_spoolss_enumprinterkey wrapper.

Guenther

commit e0c50aafce59ad4f4275ff91defb14ea44f42a65
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 23:38:05 2009 +0100

s3-net: use rpccli_spoolss_enumprinterkey wrapper.

Guenther

commit bc95ec04e6b555b1dd2ce9d253c5a3fc3f095443
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 22:07:00 2009 +0100

s3-rpcclient: use rpccli_spoolss_enumprinterkey wrapper.

Guenther

commit 86c25b353381179ee392841618c9ae34dca1d992
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 21:41:11 2009 +0100

s3-spoolss: add rpccli_spoolss_enumprinterkey convenience wrapper.

Guenther

---

Summary of changes:
 source3/include/proto.h |   15 ++---
 source3/include/rpc_spoolss.h   |   16 --
 source3/rpc_client/cli_spoolss.c|   94 ++
 source3/rpc_parse/parse_spoolss.c   |   69 -
 source3/rpc_server/srv_spoolss.c|   22 +
 source3/rpc_server/srv_spoolss_nt.c |   95 ++-
 source3/rpcclient/cmd_spoolss.c |   45 
 source3/utils/net_rpc_printer.c |   23 ++--
 8 files changed, 122 insertions(+), 257 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index e73237d..3669144 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5540,12 +5540,15 @@ WERROR rpccli_spoolss_getprinterdata(struct 
rpc_pipe_client *cli,
 uint32_t offered,
 enum winreg_Type *type,
 union spoolss_PrinterData *data);
+WERROR rpccli_spoolss_enumprinterkey(struct rpc_pipe_client *cli,
+TALLOC_CTX *mem_ctx,
+struct policy_handle *handle,
+const char *key_name,
+const char ***key_buffer,
+uint32_t offered);
 WERROR rpccli_spoolss_enumprinterdataex(struct rpc_pipe_client *cli, 
TALLOC_CTX *mem_ctx,
 POLICY_HND *hnd, const char *keyname, 
 REGVAL_CTR *ctr);
-WERROR rpccli_spoolss_enumprinterkey(struct rpc_pipe_client *cli, TALLOC_CTX 
*mem_ctx,
- POLICY_HND *hnd, const char *keyname,
- uint16 **keylist, uint32 *len);
 
 /* The following definitions come from rpc_client/init_spoolss.c  */
 
@@ -5844,11 +5847,6 @@ bool make_spoolss_buffer5(TALLOC_CTX *mem_ctx, BUFFER5 
*buf5, uint32 len, uint16
 bool make_spoolss_q_enumprinterdataex(SPOOL_Q_ENUMPRINTERDATAEX *q_u,
  const POLICY_HND *hnd, const char *key,
  uint32 size);
-bool make_spoolss_q_enumprinterkey(SPOOL_Q_ENUMPRINTERKEY *q_u, 
-  POLICY_HND *hnd, const char *key, 
-  uint32 size);
-bool spoolss_io_q_enumprinterkey(const char *desc, SPOOL_Q_ENUMPRINTERKEY 
*q_u, prs_struct *ps, int depth);
-bool spoolss_io_r_enumprinterkey(const char *desc, SPOOL_R_ENUMPRINTERKEY 
*r_u, prs_struct *ps, int depth);
 bool spoolss_io_q_enumprinterdataex(const char *desc, 
SPOOL_Q_ENUMPRINTERDATAEX *q_u, prs_struct *ps, int depth);
 bool spoolss_io_r_enumprinterdataex(const char *desc, 
SPOOL_R_ENUMPRINTERDATAEX *r_u, prs_struct *ps, int depth);
 
@@ -6050,7 +6048,6 @@ struct spoolss_DeviceMode 
*construct_dev_mode_new(TALLOC_CTX *mem_ctx,
 WERROR add_port_hook(TALLOC_CTX *ctx, NT_USER_TOKEN *token, const char 
*portname, const char *uri );
 

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-421-g4c7df92

[Günther Deschner]

The branch, v3-4-test has been updated
   via  4c7df9216b2d9db442f18de5cab5ad29c2dd54e1 (commit)
   via  6e97f5448751bfa0998e34fa3bc743585903fcca (commit)
   via  c5a4dda7f783789f4c07244ec6e785f3473bc64d (commit)
   via  27633bc18e70c68e323272d0b496022e66648d4f (commit)
   via  6c7f40873a51e56e8a93e079660f30634b4646d1 (commit)
   via  be133da8e77ad1ba89b392a2ca671dceac5f8c85 (commit)
  from  feb34c437c33b99f1ee18a5cbda7bd9157839652 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -
commit 4c7df9216b2d9db442f18de5cab5ad29c2dd54e1
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 23:10:35 2009 +0100

s3-spoolss: remove old spoolss_EnumPrinterKey.

Guenther
(cherry picked from commit 338c61060b0af1a959cfd77e4d015853a7f09bfb)

commit 6e97f5448751bfa0998e34fa3bc743585903fcca
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 23:09:15 2009 +0100

s3-spoolss: use pidl for _spoolss_EnumPrinterKey.

Guenther
(cherry picked from commit 63d78712bc11df175bc8cb3b53f1e413211d7248)

commit c5a4dda7f783789f4c07244ec6e785f3473bc64d
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 22:09:22 2009 +0100

s3-spoolss: remove old rpccli_spoolss_enumprinterkey wrapper.

Guenther
(cherry picked from commit 846b93f54f551a03dcca73c808751900e405e304)

commit 27633bc18e70c68e323272d0b496022e66648d4f
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 23:38:05 2009 +0100

s3-net: use rpccli_spoolss_enumprinterkey wrapper.

Guenther
(cherry picked from commit e0c50aafce59ad4f4275ff91defb14ea44f42a65)

commit 6c7f40873a51e56e8a93e079660f30634b4646d1
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 22:07:00 2009 +0100

s3-rpcclient: use rpccli_spoolss_enumprinterkey wrapper.

Guenther
(cherry picked from commit bc95ec04e6b555b1dd2ce9d253c5a3fc3f095443)

commit be133da8e77ad1ba89b392a2ca671dceac5f8c85
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 21:41:11 2009 +0100

s3-spoolss: add rpccli_spoolss_enumprinterkey convenience wrapper.

Guenther
(cherry picked from commit 86c25b353381179ee392841618c9ae34dca1d992)

---

Summary of changes:
 source3/include/proto.h |   15 ++---
 source3/include/rpc_spoolss.h   |   16 --
 source3/rpc_client/cli_spoolss.c|   94 ++
 source3/rpc_parse/parse_spoolss.c   |   69 -
 source3/rpc_server/srv_spoolss.c|   22 +
 source3/rpc_server/srv_spoolss_nt.c |   95 ++-
 source3/rpcclient/cmd_spoolss.c |   45 
 source3/utils/net_rpc_printer.c |   23 ++--
 8 files changed, 122 insertions(+), 257 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 725f498..68b57e1 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5540,12 +5540,15 @@ WERROR rpccli_spoolss_getprinterdata(struct 
rpc_pipe_client *cli,
 uint32_t offered,
 enum winreg_Type *type,
 union spoolss_PrinterData *data);
+WERROR rpccli_spoolss_enumprinterkey(struct rpc_pipe_client *cli,
+TALLOC_CTX *mem_ctx,
+struct policy_handle *handle,
+const char *key_name,
+const char ***key_buffer,
+uint32_t offered);
 WERROR rpccli_spoolss_enumprinterdataex(struct rpc_pipe_client *cli, 
TALLOC_CTX *mem_ctx,
 POLICY_HND *hnd, const char *keyname, 
 REGVAL_CTR *ctr);
-WERROR rpccli_spoolss_enumprinterkey(struct rpc_pipe_client *cli, TALLOC_CTX 
*mem_ctx,
- POLICY_HND *hnd, const char *keyname,
- uint16 **keylist, uint32 *len);
 
 /* The following definitions come from rpc_client/init_spoolss.c  */
 
@@ -5844,11 +5847,6 @@ bool make_spoolss_buffer5(TALLOC_CTX *mem_ctx, BUFFER5 
*buf5, uint32 len, uint16
 bool make_spoolss_q_enumprinterdataex(SPOOL_Q_ENUMPRINTERDATAEX *q_u,
  const POLICY_HND *hnd, const char *key,
  uint32 size);
-bool make_spoolss_q_enumprinterkey(SPOOL_Q_ENUMPRINTERKEY *q_u, 
-  POLICY_HND *hnd, const char *key, 
-  uint32 size);
-bool spoolss_io_q_enumprinterkey(const char *desc, SPOOL_Q_ENUMPRINTERKEY 
*q_u, prs_struct *ps, int depth);
-bool spoolss_io_r_enumprinterkey(const char *desc, SPOOL_R_ENUMPRINTERKEY 
*r_u, prs_struct *ps, 

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-452-ge89e739

[Günther Deschner]

The branch, master has been updated
   via  e89e739e22c5c3ac88f7290fb98c678c3846b755 (commit)
   via  4a58f263b9fcd24be480dadf1b464e6bc1df4590 (commit)
   via  2d10548ab16d6fa3057b4649e0ae6b9f6a52bd83 (commit)
  from  338c61060b0af1a959cfd77e4d015853a7f09bfb (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit e89e739e22c5c3ac88f7290fb98c678c3846b755
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 00:28:49 2009 +0100

s3-spoolss: remove unused init_unistr_array().

Guenther

commit 4a58f263b9fcd24be480dadf1b464e6bc1df4590
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 00:28:26 2009 +0100

s3-spoolss: remove unused get_printer_dataex().

Guenther

commit 2d10548ab16d6fa3057b4649e0ae6b9f6a52bd83
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 00:16:05 2009 +0100

s3: remove rpc_parse/parse_buffer.c completely.

Guenther

---

Summary of changes:
 source3/Makefile.in |3 +-
 source3/include/proto.h |   13 -
 source3/rpc_parse/parse_buffer.c|  509 ---
 source3/rpc_server/srv_spoolss_nt.c |  119 
 4 files changed, 1 insertions(+), 643 deletions(-)
 delete mode 100644 source3/rpc_parse/parse_buffer.c


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index f69c39b..9a1beaf 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -591,8 +591,7 @@ RPC_ECHO_OBJ = rpc_server/srv_echo_nt.o 
../librpc/gen_ndr/srv_echo.o
 RPC_SERVER_OBJ = @RPC_STATIC@ $(RPC_PIPE_OBJ)
 
 RPC_PARSE_OBJ = $(RPC_PARSE_OBJ2) \
-rpc_parse/parse_spoolss.o \
-   rpc_parse/parse_buffer.o
+rpc_parse/parse_spoolss.o
 
 RPC_CLIENT_OBJ = rpc_client/cli_pipe.o rpc_client/rpc_transport_np.o \
rpc_client/rpc_transport_sock.o rpc_client/rpc_transport_smbd.o
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 3669144..7ac5af6 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5673,19 +5673,6 @@ NTSTATUS cli_do_rpc_ndr(struct rpc_pipe_client *cli,
const struct ndr_interface_table *table,
uint32 opnum, void *r);
 
-/* The following definitions come from rpc_parse/parse_buffer.c  */
-
-bool rpcbuf_init(RPC_BUFFER *buffer, uint32 size, TALLOC_CTX *ctx);
-bool prs_rpcbuffer(const char *desc, prs_struct *ps, int depth, RPC_BUFFER 
*buffer);
-bool prs_rpcbuffer_p(const char *desc, prs_struct *ps, int depth, RPC_BUFFER 
**buffer);
-bool rpcbuf_alloc_size(RPC_BUFFER *buffer, uint32 buffer_size);
-void rpcbuf_move(RPC_BUFFER *src, RPC_BUFFER **dest);
-uint32 rpcbuf_get_size(RPC_BUFFER *buffer);
-bool smb_io_relstr(const char *desc, RPC_BUFFER *buffer, int depth, UNISTR 
*string);
-bool smb_io_relarraystr(const char *desc, RPC_BUFFER *buffer, int depth, 
uint16 **string);
-bool smb_io_relsecdesc(const char *desc, RPC_BUFFER *buffer, int depth, 
SEC_DESC **secdesc);
-uint32 size_of_relative_string(UNISTR *string);
-
 /* The following definitions come from rpc_parse/parse_misc.c  */
 
 bool smb_io_time(const char *desc, NTTIME *nttime, prs_struct *ps, int depth);
diff --git a/source3/rpc_parse/parse_buffer.c b/source3/rpc_parse/parse_buffer.c
deleted file mode 100644
index 99546ef..000
--- a/source3/rpc_parse/parse_buffer.c
+++ /dev/null
@@ -1,509 +0,0 @@
-/* 
- *  Unix SMB/CIFS implementation.
- *  RPC Pipe client / server routines
- * 
- *  Copyright (C) Andrew Tridgell  1992-2000,
- *  Copyright (C) Luke Kenneth Casson Leighton 1996-2000,
- *  Copyright (C) Jean François Micouleau  1998-2000,
- *  Copyright (C) Gerald Carter2000-2005,
- *  Copyright (C) Tim Potter  2001-2002.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, see http://www.gnu.org/licenses/.
- */
- 
-#include includes.h
-
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_RPC_PARSE
-
-/**
- Initialize a new spoolss buff for use by a client rpc
-**/
-bool rpcbuf_init(RPC_BUFFER *buffer, uint32 size, TALLOC_CTX *ctx)
-{
-   buffer-size = 

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-424-g336663c

[Günther Deschner]

The branch, v3-4-test has been updated
   via  336663c921dafecb19323bbff00062779b81ff7c (commit)
   via  9d4081a9241834b2f96ecbc0cee5ee617838a1ac (commit)
   via  bb4792208569b4baaf7472bdf95682c152399dca (commit)
  from  4c7df9216b2d9db442f18de5cab5ad29c2dd54e1 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -
commit 336663c921dafecb19323bbff00062779b81ff7c
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 00:28:49 2009 +0100

s3-spoolss: remove unused init_unistr_array().

Guenther
(cherry picked from commit e89e739e22c5c3ac88f7290fb98c678c3846b755)

commit 9d4081a9241834b2f96ecbc0cee5ee617838a1ac
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 00:28:26 2009 +0100

s3-spoolss: remove unused get_printer_dataex().

Guenther
(cherry picked from commit 4a58f263b9fcd24be480dadf1b464e6bc1df4590)

commit bb4792208569b4baaf7472bdf95682c152399dca
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 00:16:05 2009 +0100

s3: remove rpc_parse/parse_buffer.c completely.

Guenther
(cherry picked from commit 2d10548ab16d6fa3057b4649e0ae6b9f6a52bd83)

---

Summary of changes:
 source3/Makefile.in |3 +-
 source3/include/proto.h |   13 -
 source3/rpc_parse/parse_buffer.c|  509 ---
 source3/rpc_server/srv_spoolss_nt.c |  119 
 4 files changed, 1 insertions(+), 643 deletions(-)
 delete mode 100644 source3/rpc_parse/parse_buffer.c


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 6b0a151..1e48ce9 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -592,8 +592,7 @@ RPC_ECHO_OBJ = rpc_server/srv_echo_nt.o 
../librpc/gen_ndr/srv_echo.o
 RPC_SERVER_OBJ = @RPC_STATIC@ $(RPC_PIPE_OBJ)
 
 RPC_PARSE_OBJ = $(RPC_PARSE_OBJ2) \
-rpc_parse/parse_spoolss.o \
-   rpc_parse/parse_buffer.o
+rpc_parse/parse_spoolss.o
 
 RPC_CLIENT_OBJ = rpc_client/cli_pipe.o rpc_client/rpc_transport_np.o \
rpc_client/rpc_transport_sock.o rpc_client/rpc_transport_smbd.o
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 68b57e1..5c9404a 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5673,19 +5673,6 @@ NTSTATUS cli_do_rpc_ndr(struct rpc_pipe_client *cli,
const struct ndr_interface_table *table,
uint32 opnum, void *r);
 
-/* The following definitions come from rpc_parse/parse_buffer.c  */
-
-bool rpcbuf_init(RPC_BUFFER *buffer, uint32 size, TALLOC_CTX *ctx);
-bool prs_rpcbuffer(const char *desc, prs_struct *ps, int depth, RPC_BUFFER 
*buffer);
-bool prs_rpcbuffer_p(const char *desc, prs_struct *ps, int depth, RPC_BUFFER 
**buffer);
-bool rpcbuf_alloc_size(RPC_BUFFER *buffer, uint32 buffer_size);
-void rpcbuf_move(RPC_BUFFER *src, RPC_BUFFER **dest);
-uint32 rpcbuf_get_size(RPC_BUFFER *buffer);
-bool smb_io_relstr(const char *desc, RPC_BUFFER *buffer, int depth, UNISTR 
*string);
-bool smb_io_relarraystr(const char *desc, RPC_BUFFER *buffer, int depth, 
uint16 **string);
-bool smb_io_relsecdesc(const char *desc, RPC_BUFFER *buffer, int depth, 
SEC_DESC **secdesc);
-uint32 size_of_relative_string(UNISTR *string);
-
 /* The following definitions come from rpc_parse/parse_misc.c  */
 
 bool smb_io_time(const char *desc, NTTIME *nttime, prs_struct *ps, int depth);
diff --git a/source3/rpc_parse/parse_buffer.c b/source3/rpc_parse/parse_buffer.c
deleted file mode 100644
index 99546ef..000
--- a/source3/rpc_parse/parse_buffer.c
+++ /dev/null
@@ -1,509 +0,0 @@
-/* 
- *  Unix SMB/CIFS implementation.
- *  RPC Pipe client / server routines
- * 
- *  Copyright (C) Andrew Tridgell  1992-2000,
- *  Copyright (C) Luke Kenneth Casson Leighton 1996-2000,
- *  Copyright (C) Jean François Micouleau  1998-2000,
- *  Copyright (C) Gerald Carter2000-2005,
- *  Copyright (C) Tim Potter  2001-2002.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, see http://www.gnu.org/licenses/.
- */
- 
-#include includes.h
-
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_RPC_PARSE
-

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-443-g87d97ad

[Günther Deschner]

The branch, master has been updated
   via  87d97ad0422c771ea575e9a5e68d0d2e5bfe25be (commit)
   via  3255651b8375c12fc2ed668e5e1e433b00921455 (commit)
   via  3a6b5fe6c11cf395686f672635f15503d418dfb1 (commit)
   via  12c6ac6a434325d7e9837bbea6d35482767251ba (commit)
   via  56691dfe4bb6b4efe14271361247f030f7a34e18 (commit)
   via  d189824240b1bafe71fc9708ecb0deb1d5ada05e (commit)
   via  96ae179aa36c6bf799767fefad92f215338f641d (commit)
  from  acf523ad7edcde788ee79144928d74d91f0e0754 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 87d97ad0422c771ea575e9a5e68d0d2e5bfe25be
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 03:08:34 2009 +0100

s4-smbtorture: fix test_EnumPrinterKey.

Guenther

commit 3255651b8375c12fc2ed668e5e1e433b00921455
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 02:38:56 2009 +0100

s3: re-run make samba3-idl.

Guenther

commit 3a6b5fe6c11cf395686f672635f15503d418dfb1
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 21:36:18 2009 +0100

spoolss: use nstring_array in spoolss_EnumPrinterKey.

Guenther

commit 12c6ac6a434325d7e9837bbea6d35482767251ba
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 00:29:13 2009 +0100

s3-net: fix net_spoolss_setprinterdataex.

Guenther

commit 56691dfe4bb6b4efe14271361247f030f7a34e18
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 18:24:13 2009 +0100

s3-spoolss: cleanup _spoolss_SetPrinterDataEx a little.

Guenther

commit d189824240b1bafe71fc9708ecb0deb1d5ada05e
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 18:19:57 2009 +0100

s3-spoolss: cleanup _spoolss_GetPrinterDataEx a little.

Guenther

commit 96ae179aa36c6bf799767fefad92f215338f641d
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 16:02:21 2009 +0100

s3-rpcclient: fix cmd_spoolss_getprinterdataex.

Guenther

---

Summary of changes:
 librpc/gen_ndr/cli_spoolss.c|8 +-
 librpc/gen_ndr/cli_spoolss.h|4 +-
 librpc/gen_ndr/ndr_spoolss.c|   86 +++--
 librpc/gen_ndr/spoolss.h|4 +-
 librpc/gen_ndr/srv_spoolss.c|4 +-
 librpc/idl/spoolss.idl  |4 +-
 source3/rpc_server/srv_spoolss_nt.c |  121 ++-
 source3/rpcclient/cmd_spoolss.c |2 +-
 source3/utils/net_rpc_printer.c |2 +-
 source4/torture/rpc/spoolss_win.c   |8 +-
 10 files changed, 134 insertions(+), 109 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/gen_ndr/cli_spoolss.c b/librpc/gen_ndr/cli_spoolss.c
index 54346b5..a774d21 100644
--- a/librpc/gen_ndr/cli_spoolss.c
+++ b/librpc/gen_ndr/cli_spoolss.c
@@ -3811,8 +3811,8 @@ NTSTATUS rpccli_spoolss_EnumPrinterKey(struct 
rpc_pipe_client *cli,
   TALLOC_CTX *mem_ctx,
   struct policy_handle *handle /* [in] 
[ref] */,
   const char *key_name /* [in] 
[charset(UTF16)] */,
-  uint16_t *key_buffer /* [out] 
[ref,size_is(key_buffer_size/2)] */,
-  uint32_t key_buffer_size /* [in]  */,
+  const char ** *key_buffer /* [out] 
[subcontext_size(offered),ref,subcontext(0),flag(LIBNDR_FLAG_STR_NULLTERM)] */,
+  uint32_t offered /* [in]  */,
   uint32_t *needed /* [out] [ref] */,
   WERROR *werror)
 {
@@ -3822,7 +3822,7 @@ NTSTATUS rpccli_spoolss_EnumPrinterKey(struct 
rpc_pipe_client *cli,
/* In parameters */
r.in.handle = handle;
r.in.key_name = key_name;
-   r.in.key_buffer_size = key_buffer_size;
+   r.in.offered = offered;
 
if (DEBUGLEVEL = 10) {
NDR_PRINT_IN_DEBUG(spoolss_EnumPrinterKey, r);
@@ -3847,7 +3847,7 @@ NTSTATUS rpccli_spoolss_EnumPrinterKey(struct 
rpc_pipe_client *cli,
}
 
/* Return variables */
-   memcpy(key_buffer, r.out.key_buffer, r.in.key_buffer_size / 2 * 
sizeof(*key_buffer));
+   *key_buffer = *r.out.key_buffer;
*needed = *r.out.needed;
 
/* Return result */
diff --git a/librpc/gen_ndr/cli_spoolss.h b/librpc/gen_ndr/cli_spoolss.h
index a58aa3c..a30b1b1 100644
--- a/librpc/gen_ndr/cli_spoolss.h
+++ b/librpc/gen_ndr/cli_spoolss.h
@@ -497,8 +497,8 @@ NTSTATUS rpccli_spoolss_EnumPrinterKey(struct 
rpc_pipe_client *cli,
   TALLOC_CTX *mem_ctx,
   struct policy_handle *handle /* [in] 
[ref] */,
   const char *key_name /* [in] 
[charset(UTF16)] */,
-  

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-430-g4ea46d6

[Günther Deschner]

The branch, master has been updated
   via  4ea46d69bbb7651b213c5b0674f4f9fb05059acd (commit)
   via  628c12e53b68e34fa3744f57619aa5351d2519c9 (commit)
   via  f9871a846dcac079e33a9478fad5e3491a51e168 (commit)
   via  4234969df7fa973ee798bb656883a75d794006d6 (commit)
   via  b8a3e5ea0c8cc6b6b3ad6eda088673e1c8027caf (commit)
  from  6dca80518dda120753112204eaaae7961938bb9e (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 4ea46d69bbb7651b213c5b0674f4f9fb05059acd
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 12:01:29 2009 +0100

s3-net: temporary disable net_spoolss_setprinterdata.

Guenther

commit 628c12e53b68e34fa3744f57619aa5351d2519c9
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 02:26:08 2009 +0100

s3-spoolss: remove old spoolss_SetPrinterData.

Guenther

commit f9871a846dcac079e33a9478fad5e3491a51e168
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 02:24:47 2009 +0100

s3-spoolss: use pidl for _spoolss_SetPrinterData.

Guenther

commit 4234969df7fa973ee798bb656883a75d794006d6
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 02:22:59 2009 +0100

s3-spoolss: remove old rpccli_spoolss_setprinterdata wrapper.

Guenther

commit b8a3e5ea0c8cc6b6b3ad6eda088673e1c8027caf
Author: Günther Deschner g...@samba.org
Date:   Sat Mar 14 02:21:11 2009 +0100

s3-rpcclient: use rpccli_spoolss_SetPrinterData.

Guenther

---

Summary of changes:
 source3/include/proto.h |7 --
 source3/include/rpc_spoolss.h   |   18 --
 source3/rpc_client/cli_spoolss.c|   26 
 source3/rpc_parse/parse_spoolss.c   |   80 -
 source3/rpc_server/srv_spoolss.c|   22 +---
 source3/rpc_server/srv_spoolss_nt.c |   92 +---
 source3/rpcclient/cmd_spoolss.c |  111 +++
 source3/utils/net_rpc_printer.c |5 +-
 8 files changed, 95 insertions(+), 266 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 23a6c77..04f5997 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5540,8 +5540,6 @@ WERROR rpccli_spoolss_getprinterdata(struct 
rpc_pipe_client *cli,
 uint32_t offered,
 enum winreg_Type *type,
 union spoolss_PrinterData *data);
-WERROR rpccli_spoolss_setprinterdata(struct rpc_pipe_client *cli, TALLOC_CTX 
*mem_ctx,
- POLICY_HND *hnd, REGISTRY_VALUE *value);
 WERROR rpccli_spoolss_enumprinterdata(struct rpc_pipe_client *cli, TALLOC_CTX 
*mem_ctx,
   POLICY_HND *hnd, uint32 ndx,
   uint32 value_offered, uint32 data_offered,
@@ -5856,10 +5854,6 @@ bool 
make_spoolss_q_enumprinterdata(SPOOL_Q_ENUMPRINTERDATA *q_u,
 bool make_spoolss_q_enumprinterdataex(SPOOL_Q_ENUMPRINTERDATAEX *q_u,
  const POLICY_HND *hnd, const char *key,
  uint32 size);
-bool make_spoolss_q_setprinterdata(SPOOL_Q_SETPRINTERDATA *q_u, const 
POLICY_HND *hnd,
-  char* value, uint32 data_type, char* data, 
uint32 data_size);
-bool spoolss_io_q_setprinterdata(const char *desc, SPOOL_Q_SETPRINTERDATA 
*q_u, prs_struct *ps, int depth);
-bool spoolss_io_r_setprinterdata(const char *desc, SPOOL_R_SETPRINTERDATA 
*r_u, prs_struct *ps, int depth);
 bool make_spoolss_q_enumprinterkey(SPOOL_Q_ENUMPRINTERKEY *q_u, 
   POLICY_HND *hnd, const char *key, 
   uint32 size);
@@ -6067,7 +6061,6 @@ WERROR add_port_hook(TALLOC_CTX *ctx, NT_USER_TOKEN 
*token, const char *portname
 bool add_printer_hook(TALLOC_CTX *ctx, NT_USER_TOKEN *token, 
NT_PRINTER_INFO_LEVEL *printer);
 WERROR enumports_hook(TALLOC_CTX *ctx, int *count, char ***lines );
 WERROR _spoolss_enumprinterdata(pipes_struct *p, SPOOL_Q_ENUMPRINTERDATA *q_u, 
SPOOL_R_ENUMPRINTERDATA *r_u);
-WERROR _spoolss_setprinterdata( pipes_struct *p, SPOOL_Q_SETPRINTERDATA *q_u, 
SPOOL_R_SETPRINTERDATA *r_u);
 WERROR _spoolss_enumprinterkey(pipes_struct *p, SPOOL_Q_ENUMPRINTERKEY *q_u, 
SPOOL_R_ENUMPRINTERKEY *r_u);
 WERROR _spoolss_enumprinterdataex(pipes_struct *p, SPOOL_Q_ENUMPRINTERDATAEX 
*q_u, SPOOL_R_ENUMPRINTERDATAEX *r_u);
 
diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index ef1cbd1..26fb032 100644
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -317,24 +317,6 @@ typedef struct spool_r_enumprinterdata
 }
 SPOOL_R_ENUMPRINTERDATA;
 
-typedef struct spool_q_setprinterdata
-{
-   POLICY_HND handle;
-   

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-415-gfeb34c4

[Günther Deschner]

The branch, v3-4-test has been updated
   via  feb34c437c33b99f1ee18a5cbda7bd9157839652 (commit)
   via  96114fabbc8188de3ffe70e2d5cd83345944efe2 (commit)
   via  c567ba484551bdf840e0ab0d9eafba9b72b6eeb7 (commit)
   via  596f1fb47aeed9f5069c10b101fab53a8dba962c (commit)
   via  82a13732cab8fd968ec58510318d809ee046d8de (commit)
   via  161712990bb5c62d6f95c03f28b2957e5163 (commit)
   via  20cdf98d63eed4fa7e7b77ee777f464435176271 (commit)
  from  4aa6b49f2d01594d795cc79c8de37121f7f6e5a9 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -
commit feb34c437c33b99f1ee18a5cbda7bd9157839652
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 03:08:34 2009 +0100

s4-smbtorture: fix test_EnumPrinterKey.

Guenther
(cherry picked from commit 87d97ad0422c771ea575e9a5e68d0d2e5bfe25be)

commit 96114fabbc8188de3ffe70e2d5cd83345944efe2
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 02:38:56 2009 +0100

s3: re-run make samba3-idl.

Guenther
(cherry picked from commit 3255651b8375c12fc2ed668e5e1e433b00921455)

commit c567ba484551bdf840e0ab0d9eafba9b72b6eeb7
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 21:36:18 2009 +0100

spoolss: use nstring_array in spoolss_EnumPrinterKey.

Guenther
(cherry picked from commit 3a6b5fe6c11cf395686f672635f15503d418dfb1)

commit 596f1fb47aeed9f5069c10b101fab53a8dba962c
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 00:29:13 2009 +0100

s3-net: fix net_spoolss_setprinterdataex.

Guenther
(cherry picked from commit 12c6ac6a434325d7e9837bbea6d35482767251ba)

commit 82a13732cab8fd968ec58510318d809ee046d8de
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 18:24:13 2009 +0100

s3-spoolss: cleanup _spoolss_SetPrinterDataEx a little.

Guenther
(cherry picked from commit 56691dfe4bb6b4efe14271361247f030f7a34e18)

commit 161712990bb5c62d6f95c03f28b2957e5163
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 18:19:57 2009 +0100

s3-spoolss: cleanup _spoolss_GetPrinterDataEx a little.

Guenther
(cherry picked from commit d189824240b1bafe71fc9708ecb0deb1d5ada05e)

commit 20cdf98d63eed4fa7e7b77ee777f464435176271
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 16:02:21 2009 +0100

s3-rpcclient: fix cmd_spoolss_getprinterdataex.

Guenther
(cherry picked from commit 96ae179aa36c6bf799767fefad92f215338f641d)

---

Summary of changes:
 librpc/gen_ndr/cli_spoolss.c|8 +-
 librpc/gen_ndr/cli_spoolss.h|4 +-
 librpc/gen_ndr/ndr_spoolss.c|   86 +++--
 librpc/gen_ndr/spoolss.h|4 +-
 librpc/gen_ndr/srv_spoolss.c|4 +-
 librpc/idl/spoolss.idl  |4 +-
 source3/rpc_server/srv_spoolss_nt.c |  121 ++-
 source3/rpcclient/cmd_spoolss.c |2 +-
 source3/utils/net_rpc_printer.c |2 +-
 source4/torture/rpc/spoolss_win.c   |8 +-
 10 files changed, 134 insertions(+), 109 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/gen_ndr/cli_spoolss.c b/librpc/gen_ndr/cli_spoolss.c
index 54346b5..a774d21 100644
--- a/librpc/gen_ndr/cli_spoolss.c
+++ b/librpc/gen_ndr/cli_spoolss.c
@@ -3811,8 +3811,8 @@ NTSTATUS rpccli_spoolss_EnumPrinterKey(struct 
rpc_pipe_client *cli,
   TALLOC_CTX *mem_ctx,
   struct policy_handle *handle /* [in] 
[ref] */,
   const char *key_name /* [in] 
[charset(UTF16)] */,
-  uint16_t *key_buffer /* [out] 
[ref,size_is(key_buffer_size/2)] */,
-  uint32_t key_buffer_size /* [in]  */,
+  const char ** *key_buffer /* [out] 
[subcontext_size(offered),ref,subcontext(0),flag(LIBNDR_FLAG_STR_NULLTERM)] */,
+  uint32_t offered /* [in]  */,
   uint32_t *needed /* [out] [ref] */,
   WERROR *werror)
 {
@@ -3822,7 +3822,7 @@ NTSTATUS rpccli_spoolss_EnumPrinterKey(struct 
rpc_pipe_client *cli,
/* In parameters */
r.in.handle = handle;
r.in.key_name = key_name;
-   r.in.key_buffer_size = key_buffer_size;
+   r.in.offered = offered;
 
if (DEBUGLEVEL = 10) {
NDR_PRINT_IN_DEBUG(spoolss_EnumPrinterKey, r);
@@ -3847,7 +3847,7 @@ NTSTATUS rpccli_spoolss_EnumPrinterKey(struct 
rpc_pipe_client *cli,
}
 
/* Return variables */
-   memcpy(key_buffer, r.out.key_buffer, r.in.key_buffer_size / 2 * 
sizeof(*key_buffer));
+   *key_buffer = *r.out.key_buffer;
*needed = *r.out.needed;
 
/* 

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-454-gd352d3c

[Michael Adam]

The branch, master has been updated
   via  d352d3c713d86e2657f91fb86686392224764770 (commit)
   via  a23719babb7fd117ed2d4d2355748d00e415d561 (commit)
  from  e89e739e22c5c3ac88f7290fb98c678c3846b755 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit d352d3c713d86e2657f91fb86686392224764770
Author: Michael Adam ob...@samba.org
Date:   Tue Mar 17 15:51:13 2009 +0100

.gitignore source4/torture/ldb/proto.h

Michael

commit a23719babb7fd117ed2d4d2355748d00e415d561
Author: Björn Jacke b...@sernet.de
Date:   Sun Mar 15 17:26:21 2009 +0100

fix build on sles8 and other old popt installations

Signed-off-by: Michael Adam ob...@samba.org

---

Summary of changes:
 .gitignore|1 +
 source4/lib/cmdline/popt_common.h |4 
 2 files changed, 5 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/.gitignore b/.gitignore
index f1440ca..7a2462c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -280,6 +280,7 @@ source4/tests
 source4/torture/auth/proto.h
 source4/torture/basic/proto.h
 source4/torture/ldap/proto.h
+source4/torture/ldb/proto.h
 source4/torture/libnet/proto.h
 source4/torture/local/proto.h
 source4/torture/nbench/proto.h
diff --git a/source4/lib/cmdline/popt_common.h 
b/source4/lib/cmdline/popt_common.h
index 733d12a..2f4ab2c 100644
--- a/source4/lib/cmdline/popt_common.h
+++ b/source4/lib/cmdline/popt_common.h
@@ -28,6 +28,10 @@ extern struct poptOption popt_common_connection[];
 extern struct poptOption popt_common_version[];
 extern struct poptOption popt_common_credentials[];
 
+#ifndef POPT_TABLEEND
+#define POPT_TABLEEND { NULL, '\0', 0, 0, 0, NULL, NULL }
+#endif
+
 #define POPT_COMMON_SAMBA { NULL, 0, POPT_ARG_INCLUDE_TABLE, 
popt_common_samba, 0, Common samba options:, NULL },
 #define POPT_COMMON_CONNECTION { NULL, 0, POPT_ARG_INCLUDE_TABLE, 
popt_common_connection, 0, Connection options:, NULL },
 #define POPT_COMMON_VERSION { NULL, 0, POPT_ARG_INCLUDE_TABLE, 
popt_common_version, 0, Common samba options:, NULL },


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-455-gda06a34

[Michael Adam]

The branch, master has been updated
   via  da06a345cc290ca29234bc231fc9174d2780cf4f (commit)
  from  d352d3c713d86e2657f91fb86686392224764770 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit da06a345cc290ca29234bc231fc9174d2780cf4f
Author: Björn Jacke b...@sernet.de
Date:   Sun Mar 8 12:54:04 2009 +0100

to be portable, use options first, arguments last

Signed-off-by: Michael Adam ob...@samba.org

---

Summary of changes:
 source3/script/installmo.sh |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/script/installmo.sh b/source3/script/installmo.sh
index 9c4ab1e..5ca3371 100644
--- a/source3/script/installmo.sh
+++ b/source3/script/installmo.sh
@@ -35,7 +35,7 @@ for dir in $SRCDIR/locale/*; do
if test $mode = 'install'; then
echo Installing $f as $FNAME
touch $FNAME
-   $MSGFMT $f -f -o $FNAME
+   $MSGFMT -f -o $FNAME $f
if test ! -f $FNAME; then
echo Cannot install $FNAME. Does $USER have 
privileges?
exit 1


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-456-g066cbb5

[Michael Adam]

The branch, master has been updated
   via  066cbb5835feae90e2ce4172e3c58bf50a2b004b (commit)
  from  da06a345cc290ca29234bc231fc9174d2780cf4f (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 066cbb5835feae90e2ce4172e3c58bf50a2b004b
Author: Björn Jacke b...@sernet.de
Date:   Wed Mar 11 15:32:49 2009 +0100

clean up lib64 linking paths the same way as lib

Signed-off-by: Michael Adam ob...@samba.org

---

Summary of changes:
 source3/m4/aclocal.m4 |   10 --
 source4/aclocal.m4|   10 --
 2 files changed, 16 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/m4/aclocal.m4 b/source3/m4/aclocal.m4
index aae729c..dff4970 100644
--- a/source3/m4/aclocal.m4
+++ b/source3/m4/aclocal.m4
@@ -386,11 +386,17 @@ AC_DEFUN(LIB_REMOVE_USR_LIB,[
 case [$]l[$]i in
 -L/usr/lib) ;;
 -L/usr/lib/) ;;
--Wl,-rpath,/usr/lib) ;;
--Wl,-rpath,/usr/lib/) ;;
+-L/usr/lib64) ;;
+-L/usr/lib64/) ;;
+-Wl,-rpath,/usr/lib) l=;;
+-Wl,-rpath,/usr/lib/) l=;;
+-Wl,-rpath,/usr/lib64) l=;;
+-Wl,-rpath,/usr/lib64/) l=;;
 -Wl,-rpath) l=[$]i;;
 -Wl,-rpath-Wl,/usr/lib) l=;;
 -Wl,-rpath-Wl,/usr/lib/) l=;;
+-Wl,-rpath-Wl,/usr/lib64) l=;;
+-Wl,-rpath-Wl,/usr/lib64/) l=;;
 *)
s= 
 if test x[$]ac_new_flags = x; then
diff --git a/source4/aclocal.m4 b/source4/aclocal.m4
index 240a994..8ad8f47 100644
--- a/source4/aclocal.m4
+++ b/source4/aclocal.m4
@@ -31,11 +31,17 @@ AC_DEFUN(LIB_REMOVE_USR_LIB,[
 case [$]l[$]i in
 -L/usr/lib) ;;
 -L/usr/lib/) ;;
--Wl,-rpath,/usr/lib) ;;
--Wl,-rpath,/usr/lib/) ;;
+-L/usr/lib64) ;;
+-L/usr/lib64/) ;;
+-Wl,-rpath,/usr/lib) l=;;
+-Wl,-rpath,/usr/lib/) l=;;
+-Wl,-rpath,/usr/lib64) l=;;
+-Wl,-rpath,/usr/lib64/) l=;;
 -Wl,-rpath) l=[$]i;;
 -Wl,-rpath-Wl,/usr/lib) l=;;
 -Wl,-rpath-Wl,/usr/lib/) l=;;
+-Wl,-rpath-Wl,/usr/lib64) l=;;
+-Wl,-rpath-Wl,/usr/lib64/) l=;;
 *)
s= 
 if test x[$]ac_new_flags = x; then


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-457-gc7dba46

[Michael Adam]

The branch, master has been updated
   via  c7dba467f268d0007c58e7de4985dc5386a44c6f (commit)
  from  066cbb5835feae90e2ce4172e3c58bf50a2b004b (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit c7dba467f268d0007c58e7de4985dc5386a44c6f
Author: Björn Jacke b...@sernet.de
Date:   Wed Mar 11 15:44:45 2009 +0100

remove needless rpath stuff for default paths as early as possible

Signed-off-by: Michael Adam ob...@samba.org

---

Summary of changes:
 source3/configure.in |4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 70876b9..2c7c182 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3277,6 +3277,9 @@ if test x$with_ads_support != xno; then
   ac_save_CPPFLAGS=$CPPFLAGS
   ac_save_LDFLAGS=$LDFLAGS
 
+  # remove needless evil rpath stuff as early as possible:
+  LIB_REMOVE_USR_LIB(KRB5_LIBS)
+  LIB_REMOVE_USR_LIB(KRB5_LDFLAGS)
   CFLAGS=$KRB5_CFLAGS $CFLAGS
   CPPFLAGS=$KRB5_CPPFLAGS $CPPFLAGS
   LDFLAGS=$KRB5_LDFLAGS $LDFLAGS
@@ -6358,7 +6361,6 @@ AC_ZLIB([ZLIB_OBJS=], [
 dnl Remove -L/usr/lib/? from LDFLAGS and LIBS
 LIB_REMOVE_USR_LIB(LDFLAGS)
 LIB_REMOVE_USR_LIB(LIBS)
-LIB_REMOVE_USR_LIB(KRB5_LIBS)
 
 dnl Remove -I/usr/include/? from CFLAGS and CPPFLAGS
 CFLAGS_REMOVE_USR_INCLUDE(CFLAGS)


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-460-gb693f7f

[Volker Lendecke]

The branch, master has been updated
   via  b693f7f067d378858affe0b7ffa6ca8a6d2b82ee (commit)
   via  bce98d8c031f9f093ec3adfcf6de9a61cdd3730e (commit)
   via  89543d6c7819fec7ab291f86cda1298ba93476be (commit)
  from  c7dba467f268d0007c58e7de4985dc5386a44c6f (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit b693f7f067d378858affe0b7ffa6ca8a6d2b82ee
Author: Volker Lendecke v...@samba.org
Date:   Tue Mar 17 09:38:14 2009 +0100

Remove some transitional code in writev_send

commit bce98d8c031f9f093ec3adfcf6de9a61cdd3730e
Author: Volker Lendecke v...@samba.org
Date:   Tue Mar 17 09:34:17 2009 +0100

Convert np_read to tevent_req

commit 89543d6c7819fec7ab291f86cda1298ba93476be
Author: Volker Lendecke v...@samba.org
Date:   Tue Mar 17 09:17:16 2009 +0100

Convert np_write to tevent_req

---

Summary of changes:
 lib/async_req/async_sock.c|   18 +-
 source3/include/proto.h   |   14 ++--
 source3/rpc_server/srv_pipe_hnd.c |  130 ++---
 source3/smbd/ipc.c|   26 
 source3/smbd/pipes.c  |   42 ++--
 5 files changed, 103 insertions(+), 127 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/async_req/async_sock.c b/lib/async_req/async_sock.c
index be24bae..77df406 100644
--- a/lib/async_req/async_sock.c
+++ b/lib/async_req/async_sock.c
@@ -389,7 +389,6 @@ struct tevent_req *writev_send(TALLOC_CTX *mem_ctx, struct 
tevent_context *ev,
 {
struct tevent_req *result;
struct writev_state *state;
-   struct tevent_fd *fde;
 
result = tevent_req_create(mem_ctx, state, struct writev_state);
if (result == NULL) {
@@ -405,22 +404,7 @@ struct tevent_req *writev_send(TALLOC_CTX *mem_ctx, struct 
tevent_context *ev,
goto fail;
}
 
-   /*
-* This if () should go away once our callers are converted to always
-* pass in a queue.
-*/
-
-   if (queue != NULL) {
-   if (!tevent_queue_add(queue, ev, result, writev_trigger,
- NULL)) {
-   goto fail;
-   }
-   return result;
-   }
-
-   fde = tevent_add_fd(ev, state, fd, TEVENT_FD_WRITE, writev_handler,
-   result);
-   if (fde == NULL) {
+   if (!tevent_queue_add(queue, ev, result, writev_trigger, NULL)) {
goto fail;
}
return result;
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 7ac5af6..f837a31 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5915,14 +5915,14 @@ NTSTATUS np_open(TALLOC_CTX *mem_ctx, const char *name,
 const char *client_address,
 struct auth_serversupplied_info *server_info,
 struct fake_file_handle **phandle);
-struct async_req *np_write_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
+struct tevent_req *np_write_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
+struct fake_file_handle *handle,
+const uint8_t *data, size_t len);
+NTSTATUS np_write_recv(struct tevent_req *req, ssize_t *pnwritten);
+struct tevent_req *np_read_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
struct fake_file_handle *handle,
-   const uint8_t *data, size_t len);
-NTSTATUS np_write_recv(struct async_req *req, ssize_t *nwritten);
-struct async_req *np_read_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
-  struct fake_file_handle *handle,
-  uint8_t *data, size_t len);
-NTSTATUS np_read_recv(struct async_req *req, ssize_t *nread,
+   uint8_t *data, size_t len);
+NTSTATUS np_read_recv(struct tevent_req *req, ssize_t *nread,
  bool *is_data_outstanding);
 
 /* The following definitions come from rpc_server/srv_samr_util.c  */
diff --git a/source3/rpc_server/srv_pipe_hnd.c 
b/source3/rpc_server/srv_pipe_hnd.c
index fb7aca5..503e22b 100644
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -943,8 +943,8 @@ bool fsp_is_np(struct files_struct *fsp)
 }
 
 struct np_proxy_state {
-   struct async_req_queue *read_queue;
-   struct async_req_queue *write_queue;
+   struct tevent_queue *read_queue;
+   struct tevent_queue *write_queue;
int fd;
 
uint8_t *msg;
@@ -1104,11 +1104,11 @@ static struct np_proxy_state 
*make_external_rpc_pipe_p(TALLOC_CTX *mem_ctx,
 
result-msg = NULL;
 
-   result-read_queue = async_req_queue_init(result);
+   result-read_queue = tevent_queue_create(result, np_read);
if (result-read_queue == NULL) {
   

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-427-gfc0dfba

[Volker Lendecke]

The branch, v3-4-test has been updated
   via  fc0dfba28f3c6e22b1d4bb19577e735c3db16f1e (commit)
   via  1f9bfa0673d47adcd62ceee5605788cc11201f3c (commit)
   via  15ff8c88fbf1f417e8a0b0e0c25524d692d63a37 (commit)
  from  336663c921dafecb19323bbff00062779b81ff7c (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -
commit fc0dfba28f3c6e22b1d4bb19577e735c3db16f1e
Author: Volker Lendecke v...@samba.org
Date:   Tue Mar 17 09:38:14 2009 +0100

Remove some transitional code in writev_send

commit 1f9bfa0673d47adcd62ceee5605788cc11201f3c
Author: Volker Lendecke v...@samba.org
Date:   Tue Mar 17 09:34:17 2009 +0100

Convert np_read to tevent_req

commit 15ff8c88fbf1f417e8a0b0e0c25524d692d63a37
Author: Volker Lendecke v...@samba.org
Date:   Tue Mar 17 09:17:16 2009 +0100

Convert np_write to tevent_req

---

Summary of changes:
 lib/async_req/async_sock.c|   18 +-
 source3/include/proto.h   |   14 ++--
 source3/rpc_server/srv_pipe_hnd.c |  130 ++---
 source3/smbd/ipc.c|   26 
 source3/smbd/pipes.c  |   42 ++--
 5 files changed, 103 insertions(+), 127 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/async_req/async_sock.c b/lib/async_req/async_sock.c
index be24bae..77df406 100644
--- a/lib/async_req/async_sock.c
+++ b/lib/async_req/async_sock.c
@@ -389,7 +389,6 @@ struct tevent_req *writev_send(TALLOC_CTX *mem_ctx, struct 
tevent_context *ev,
 {
struct tevent_req *result;
struct writev_state *state;
-   struct tevent_fd *fde;
 
result = tevent_req_create(mem_ctx, state, struct writev_state);
if (result == NULL) {
@@ -405,22 +404,7 @@ struct tevent_req *writev_send(TALLOC_CTX *mem_ctx, struct 
tevent_context *ev,
goto fail;
}
 
-   /*
-* This if () should go away once our callers are converted to always
-* pass in a queue.
-*/
-
-   if (queue != NULL) {
-   if (!tevent_queue_add(queue, ev, result, writev_trigger,
- NULL)) {
-   goto fail;
-   }
-   return result;
-   }
-
-   fde = tevent_add_fd(ev, state, fd, TEVENT_FD_WRITE, writev_handler,
-   result);
-   if (fde == NULL) {
+   if (!tevent_queue_add(queue, ev, result, writev_trigger, NULL)) {
goto fail;
}
return result;
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 5c9404a..6510018 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5915,14 +5915,14 @@ NTSTATUS np_open(TALLOC_CTX *mem_ctx, const char *name,
 const char *client_address,
 struct auth_serversupplied_info *server_info,
 struct fake_file_handle **phandle);
-struct async_req *np_write_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
+struct tevent_req *np_write_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
+struct fake_file_handle *handle,
+const uint8_t *data, size_t len);
+NTSTATUS np_write_recv(struct tevent_req *req, ssize_t *pnwritten);
+struct tevent_req *np_read_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
struct fake_file_handle *handle,
-   const uint8_t *data, size_t len);
-NTSTATUS np_write_recv(struct async_req *req, ssize_t *nwritten);
-struct async_req *np_read_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
-  struct fake_file_handle *handle,
-  uint8_t *data, size_t len);
-NTSTATUS np_read_recv(struct async_req *req, ssize_t *nread,
+   uint8_t *data, size_t len);
+NTSTATUS np_read_recv(struct tevent_req *req, ssize_t *nread,
  bool *is_data_outstanding);
 
 /* The following definitions come from rpc_server/srv_samr_util.c  */
diff --git a/source3/rpc_server/srv_pipe_hnd.c 
b/source3/rpc_server/srv_pipe_hnd.c
index fb7aca5..503e22b 100644
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -943,8 +943,8 @@ bool fsp_is_np(struct files_struct *fsp)
 }
 
 struct np_proxy_state {
-   struct async_req_queue *read_queue;
-   struct async_req_queue *write_queue;
+   struct tevent_queue *read_queue;
+   struct tevent_queue *write_queue;
int fd;
 
uint8_t *msg;
@@ -1104,11 +1104,11 @@ static struct np_proxy_state 
*make_external_rpc_pipe_p(TALLOC_CTX *mem_ctx,
 
result-msg = NULL;
 
-   result-read_queue = async_req_queue_init(result);
+   result-read_queue = tevent_queue_create(result, np_read);
if (result-read_queue == NULL) {
 

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-481-g77d2cd1

[Günther Deschner]

The branch, master has been updated
   via  77d2cd1ff7dab3a7a76449bfb3fe1d6e80df292b (commit)
   via  b57d5eaac03b38a605fb8853dbb18c208461b0bb (commit)
   via  fac7208273a24fa35d3274df28aea3bb87374861 (commit)
   via  7f90a89d609c48b7fe33e29c98ca903896083889 (commit)
   via  479d91ae9f0868f02dd70b80e3033eb9ff166541 (commit)
   via  9b5666aa70fda80220347a7a1a6a07e4c1d121a8 (commit)
   via  f32cf73019bb45b30f3fb0151dad3e65d7694d46 (commit)
   via  289cfb269b486a0a2f8376ead77fd64ad7c012d4 (commit)
   via  a264bc68f0e44fb561fe61613b5cf3c7b5e8385f (commit)
   via  f94a6f4801e5b2b83e5f4888aba21f3647e23f9a (commit)
   via  4cb3cbea84c6cf30b123eb5070905eeed5aba4d7 (commit)
   via  f19faa0e768f477c26b92f87905cfdb7245dbaa1 (commit)
   via  5778a36357f1560b9a8e5828cf789be4357ceb0c (commit)
   via  1e7f602f8c1c19761758eee4e3287d711ff6cf92 (commit)
   via  6549408a4ddb97d109eccb3f8b8bac456b4c4bc8 (commit)
   via  827ba0a64b33ca9caf7673f195cf17c1d5b84b66 (commit)
   via  96998f03584608e3cb30a61120d497b45d0af001 (commit)
   via  d759f9961a30c5dc9920f620b783ffa58daf9b03 (commit)
   via  47c024fd7516aa940b6b04f903cedff677e5543e (commit)
   via  28d16866ee639f828ea644753f29a678605883a5 (commit)
   via  2d318490ea524ced22e8c256d4343755edc58a82 (commit)
  from  b693f7f067d378858affe0b7ffa6ca8a6d2b82ee (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 77d2cd1ff7dab3a7a76449bfb3fe1d6e80df292b
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 18:36:43 2009 +0100

s3-spoolss: remove unused RPC_BUFFER definition.

Guenther

commit b57d5eaac03b38a605fb8853dbb18c208461b0bb
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 18:34:45 2009 +0100

s3-spoolss: remove (disabled) enum_all_printers_info_1_remote.

Jerry, please check. I do not understand how this could work and in
it's current form, we cannot make this even compile anymore, I'm afraid :)
I think it is safe to remove.

Guenther

commit fac7208273a24fa35d3274df28aea3bb87374861
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 18:03:36 2009 +0100

s4-smbtorture: fix spoolss notify test for notify type changes.

Guenther

commit 7f90a89d609c48b7fe33e29c98ca903896083889
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 18:03:10 2009 +0100

s3-spoolss: remove PRINTER_NOTIFY_TYPE and JOB_NOTIFY_TYPE now defined in 
IDL.

Guenther

commit 479d91ae9f0868f02dd70b80e3033eb9ff166541
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 17:31:18 2009 +0100

s3-spoolss: remove SPL Port definitions now in IDL.

Guenther

commit 9b5666aa70fda80220347a7a1a6a07e4c1d121a8
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 17:25:07 2009 +0100

s3-spoolss: remove PRIORITY defines, that were never used.

Guenther

commit f32cf73019bb45b30f3fb0151dad3e65d7694d46
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 17:24:47 2009 +0100

s3: re-run make samba3-idl.

Guenther

commit 289cfb269b486a0a2f8376ead77fd64ad7c012d4
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 18:01:11 2009 +0100

spoolss: use PRINTER_NOTIFY_TYPE and JOB_NOTIFY_TYPE in favor of old s4 
defines.

Guenther

commit a264bc68f0e44fb561fe61613b5cf3c7b5e8385f
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 17:30:07 2009 +0100

spoolss: add SPL Port definitions to IDL.

Guenther

commit f94a6f4801e5b2b83e5f4888aba21f3647e23f9a
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 17:24:01 2009 +0100

spoolss: add range checks for priority element in spoolss_JobInfo structs.

Guenther

commit 4cb3cbea84c6cf30b123eb5070905eeed5aba4d7
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 17:17:18 2009 +0100

s3-spoolss: move DRIVER_X_VERSION flags into the backend, where they belong 
to.

Guenther

commit f19faa0e768f477c26b92f87905cfdb7245dbaa1
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 16:41:16 2009 +0100

s3-spoolss: remove unused DEVICEMODE parsing and header.

Guenther

commit 5778a36357f1560b9a8e5828cf789be4357ceb0c
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 15:26:38 2009 +0100

s3-spoolss: rename convert_printer_info_new to convert_printer_info.

Guenther

commit 1e7f602f8c1c19761758eee4e3287d711ff6cf92
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 15:25:07 2009 +0100

s3-spoolss: rename convert_nt_devicemode_new to convert_nt_devicemode.

Guenther

commit 6549408a4ddb97d109eccb3f8b8bac456b4c4bc8
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 15:23:30 2009 +0100

s3-spoolss: rename construct_dev_mode_new to construct_dev_mode.

Guenther

commit 827ba0a64b33ca9caf7673f195cf17c1d5b84b66
Author: 

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-448-gfa9d1f6

[Günther Deschner]

The branch, v3-4-test has been updated
   via  fa9d1f633796bff86e899b48e3ea8bb77492c10b (commit)
   via  43770f36703866e0a826fcae2ae1c7ce2cf4f056 (commit)
   via  37141ad861d0bd4c215350c7611132a40748a8bf (commit)
   via  a2f7943d6d0b36b5e55d20c1b6d299af485a469e (commit)
   via  ddbea456e5a20cade1772029c433c2e285ebbda3 (commit)
   via  0c4293155aeeea29f5aa97f00d9a18602da47338 (commit)
   via  6b0c35e09fd471f55431cd40e383da66f2b5d143 (commit)
   via  18a2dd3fa0aee8a8cd5638b90c0553966c34919c (commit)
   via  6069010991dc2b3272fc4ba51504f2f9ce97c43d (commit)
   via  ec845d14417c3883b08f38971c5f5a2d76c7cf48 (commit)
   via  2d01207b28bb4c0c26a7c7f37a2be285c904dfdc (commit)
   via  3a1d1e62fd903c49e04fd7880a1706abc5961127 (commit)
   via  afe6696a5a75d40892f2a551c406e623f0a3b3a1 (commit)
   via  2902761ab0e6b95616fc99e685343bc2d0d43c84 (commit)
   via  040c35afc2571a734e4d9f5f1d4e4c2d97f2e4bc (commit)
   via  bee5ae5a3c016e1513f685973478bb1dec2ecf76 (commit)
   via  1342e045416870bc891ae60fe96742ef9f2362b2 (commit)
   via  cc84717f8d915564e786e9d01fc8b337e03a9c0b (commit)
   via  05d441f7ff79b20e23f549d7d6c6567c8ec554e0 (commit)
   via  3763cc73f7c25905828183e756dac8340afa6fd4 (commit)
   via  821c91108af686ea8cdebe7bf3b4f560aeb8eaa1 (commit)
  from  fc0dfba28f3c6e22b1d4bb19577e735c3db16f1e (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -
commit fa9d1f633796bff86e899b48e3ea8bb77492c10b
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 18:36:43 2009 +0100

s3-spoolss: remove unused RPC_BUFFER definition.

Guenther
(cherry picked from commit 77d2cd1ff7dab3a7a76449bfb3fe1d6e80df292b)

commit 43770f36703866e0a826fcae2ae1c7ce2cf4f056
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 18:34:45 2009 +0100

s3-spoolss: remove (disabled) enum_all_printers_info_1_remote.

Jerry, please check. I do not understand how this could work and in
it's current form, we cannot make this even compile anymore, I'm afraid :)
I think it is safe to remove.

Guenther
(cherry picked from commit b57d5eaac03b38a605fb8853dbb18c208461b0bb)

commit 37141ad861d0bd4c215350c7611132a40748a8bf
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 18:03:36 2009 +0100

s4-smbtorture: fix spoolss notify test for notify type changes.

Guenther
(cherry picked from commit fac7208273a24fa35d3274df28aea3bb87374861)

commit a2f7943d6d0b36b5e55d20c1b6d299af485a469e
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 18:03:10 2009 +0100

s3-spoolss: remove PRINTER_NOTIFY_TYPE and JOB_NOTIFY_TYPE now defined in 
IDL.

Guenther
(cherry picked from commit 7f90a89d609c48b7fe33e29c98ca903896083889)

commit ddbea456e5a20cade1772029c433c2e285ebbda3
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 17:31:18 2009 +0100

s3-spoolss: remove SPL Port definitions now in IDL.

Guenther
(cherry picked from commit 479d91ae9f0868f02dd70b80e3033eb9ff166541)

commit 0c4293155aeeea29f5aa97f00d9a18602da47338
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 17:25:07 2009 +0100

s3-spoolss: remove PRIORITY defines, that were never used.

Guenther
(cherry picked from commit 9b5666aa70fda80220347a7a1a6a07e4c1d121a8)

commit 6b0c35e09fd471f55431cd40e383da66f2b5d143
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 17:24:47 2009 +0100

s3: re-run make samba3-idl.

Guenther
(cherry picked from commit f32cf73019bb45b30f3fb0151dad3e65d7694d46)

commit 18a2dd3fa0aee8a8cd5638b90c0553966c34919c
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 18:01:11 2009 +0100

spoolss: use PRINTER_NOTIFY_TYPE and JOB_NOTIFY_TYPE in favor of old s4 
defines.

Guenther
(cherry picked from commit 289cfb269b486a0a2f8376ead77fd64ad7c012d4)

commit 6069010991dc2b3272fc4ba51504f2f9ce97c43d
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 17:30:07 2009 +0100

spoolss: add SPL Port definitions to IDL.

Guenther
(cherry picked from commit a264bc68f0e44fb561fe61613b5cf3c7b5e8385f)

commit ec845d14417c3883b08f38971c5f5a2d76c7cf48
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 17:24:01 2009 +0100

spoolss: add range checks for priority element in spoolss_JobInfo structs.

Guenther
(cherry picked from commit f94a6f4801e5b2b83e5f4888aba21f3647e23f9a)

commit 2d01207b28bb4c0c26a7c7f37a2be285c904dfdc
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 17:17:18 2009 +0100

s3-spoolss: move DRIVER_X_VERSION flags into the backend, where they belong 
to.

Guenther
(cherry picked from commit 4cb3cbea84c6cf30b123eb5070905eeed5aba4d7)

commit 3a1d1e62fd903c49e04fd7880a1706abc5961127
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 16:41:16 

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-493-ge95d0b5

[Stefan Metzmacher]

The branch, master has been updated
   via  e95d0b548e344dbc8cb3dd0a0f29854711bd0cac (commit)
   via  7d07266ca26f7069269601043b713a91f1a4693c (commit)
   via  9eaf53d98eced9ea70f411b9936b475c42e4d490 (commit)
   via  3a831e46204979550dc6ee7652cea6b8296f10c1 (commit)
   via  4bdf299385220988a4fe16f82aab528283204c7f (commit)
   via  a78cd2a24b818bc7d843a8e56ffaafc9f6578662 (commit)
   via  6c290586e41b3f5f7748a5b8c782be67cafe6c57 (commit)
   via  66886f8966dff8a980a5b9d2daa3fbb20fe5ca8e (commit)
   via  d27be1d5fa3fdcaac07b527ad14b0d10ef27c0bb (commit)
   via  940e61846e97ba62153d5b977b0823f196607743 (commit)
   via  0139befb915006d6ec9fec2734057c5c50b3c383 (commit)
   via  3af7db3dce0e5529114f6969e9905c6d4c65dfe8 (commit)
  from  77d2cd1ff7dab3a7a76449bfb3fe1d6e80df292b (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit e95d0b548e344dbc8cb3dd0a0f29854711bd0cac
Author: Stefan Metzmacher me...@samba.org
Date:   Tue Mar 17 20:18:31 2009 +0100

s4:build: require tevent 0.9.5

metze

commit 7d07266ca26f7069269601043b713a91f1a4693c
Author: Stefan Metzmacher me...@samba.org
Date:   Tue Mar 17 20:18:01 2009 +0100

tevent: change version to 0.9.5 after the ABI has changed

metze

commit 9eaf53d98eced9ea70f411b9936b475c42e4d490
Author: Stefan Metzmacher me...@samba.org
Date:   Tue Mar 17 20:13:34 2009 +0100

tevent: store the location where a request was finished

This is very useful to find bugs.
You can use 'p *req' in gdb to show where
tevent_req_done(), tevent_req_error() or tevent_req_nomem()
was called.

metze

commit 3a831e46204979550dc6ee7652cea6b8296f10c1
Author: Stefan Metzmacher me...@samba.org
Date:   Tue Mar 17 10:42:55 2009 +0100

tevent: use an immediate event as trigger for tevent_queue

metze

commit 4bdf299385220988a4fe16f82aab528283204c7f
Author: Stefan Metzmacher me...@samba.org
Date:   Tue Mar 17 10:18:34 2009 +0100

tevent: use an immediate event fot tevent_req_post()

Now tevent_req_post() never fails

metze

commit a78cd2a24b818bc7d843a8e56ffaafc9f6578662
Author: Stefan Metzmacher me...@samba.org
Date:   Tue Mar 17 10:17:50 2009 +0100

tevent: use TALLOC_FREE() in tevent_req.c

metze

commit 6c290586e41b3f5f7748a5b8c782be67cafe6c57
Author: Stefan Metzmacher me...@samba.org
Date:   Mon Mar 16 15:06:52 2009 +0100

s3:events: add support for immediate events

metze

commit 66886f8966dff8a980a5b9d2daa3fbb20fe5ca8e
Author: Stefan Metzmacher me...@samba.org
Date:   Fri Mar 13 15:47:33 2009 +0100

tevent: add support for immediate events

They're like directly triggered timed events,
but you can preallocated them and scheduling them
will not fail.

metze

commit d27be1d5fa3fdcaac07b527ad14b0d10ef27c0bb
Author: Stefan Metzmacher me...@samba.org
Date:   Mon Mar 16 14:45:42 2009 +0100

s3:events: make use of tevent_common_loop_wait()

metze

commit 940e61846e97ba62153d5b977b0823f196607743
Author: Stefan Metzmacher me...@samba.org
Date:   Mon Mar 16 14:15:07 2009 +0100

tevent: add tevent_common_loop_wait() helper function and use it

tevent_loop_wait should do the same for all backends.
It should loop as long as we have pending events.

metze

commit 0139befb915006d6ec9fec2734057c5c50b3c383
Author: Stefan Metzmacher me...@samba.org
Date:   Mon Mar 16 12:45:48 2009 +0100

tevent: check signal events first in event_loop_once

We also check for signal events directly before and after
the select/epoll calls.

metze

commit 3af7db3dce0e5529114f6969e9905c6d4c65dfe8
Author: Stefan Metzmacher me...@samba.org
Date:   Mon Mar 16 12:34:23 2009 +0100

tevent: let tevent_loop_once() just run one fd event

This makes the logic much simpler for the callers,
and matches the samba3 behavior.

If needed we can add performance tunning for tevent_loop_wait()
later.

metze

---

Summary of changes:
 lib/tevent/configure.ac   |2 +-
 lib/tevent/libtevent.m4   |3 +-
 lib/tevent/tevent.c   |   77 +++
 lib/tevent/tevent.h   |   41 ++--
 lib/tevent/tevent_epoll.c |   62 +++
 lib/tevent/tevent_immediate.c |  139 +
 lib/tevent/tevent_internal.h  |   53 +++-
 lib/tevent/tevent_queue.c |   99 +
 lib/tevent/tevent_req.c   |   74 +++---
 lib/tevent/tevent_select.c|   60 +++---
 lib/tevent/tevent_standard.c  |   69 +++--
 source3/lib/events.c  |   35 +--
 source4/min_versions.m4   |2 +-
 13 files changed, 482 insertions(+), 234 deletions(-)
 create mode 

[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3505-ge6a23d4

[Volker Lendecke]

The branch, v3-2-test has been updated
   via  e6a23d498bfd4bbe19cecf24ba3f94af83c9bf8b (commit)
  from  20d378eebfcaca53f456f0fbae39d46031729de7 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -
commit e6a23d498bfd4bbe19cecf24ba3f94af83c9bf8b
Author: Volker Lendecke v...@samba.org
Date:   Mon Mar 16 13:17:04 2009 +0100

Fix #6130: Don't crash in winbindd_rpc lookup_groupmem() on unmapped members

Thanks to François Legal de...@thom.fr.eu.org for reporting this bug

---

Summary of changes:
 source/winbindd/winbindd_rpc.c |   15 ---
 1 files changed, 8 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/winbindd/winbindd_rpc.c b/source/winbindd/winbindd_rpc.c
index b03e035..f6a9c66 100644
--- a/source/winbindd/winbindd_rpc.c
+++ b/source/winbindd/winbindd_rpc.c
@@ -821,14 +821,15 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain 
*domain,
}
 
for (r=0; rtmp_names.count; r++) {
-   (*names)[i+r] = fill_domain_username_talloc(mem_ctx,
-   domain-name,
-   tmp_names.names[r].string,
-   true);
-   (*name_types)[i+r] = tmp_types.ids[r];
+   if (tmp_types.ids[r] == SID_NAME_UNKNOWN) {
+   continue;
+   }
+   (*names)[total_names] = fill_domain_username_talloc(
+   mem_ctx, domain-name,
+   tmp_names.names[r].string, true);
+   (*name_types)[total_names] = tmp_types.ids[r];
+   total_names += 1;
}
-
-   total_names += tmp_names.count;
 }
 
 *num_names = total_names;


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5070-gdb811fb

[Volker Lendecke]

The branch, v3-3-test has been updated
   via  db811fbc3570f55b170567dbfd8882d270c10d83 (commit)
  from  c863f8c767c9112a31da7b9f8a84c6c07bfb9d37 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -
commit db811fbc3570f55b170567dbfd8882d270c10d83
Author: Volker Lendecke v...@samba.org
Date:   Mon Mar 16 13:17:04 2009 +0100

Fix #6130: Don't crash in winbindd_rpc lookup_groupmem() on unmapped members

Thanks to François Legal de...@thom.fr.eu.org for reporting this bug

---

Summary of changes:
 source/winbindd/winbindd_rpc.c |   15 ---
 1 files changed, 8 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/winbindd/winbindd_rpc.c b/source/winbindd/winbindd_rpc.c
index efc9dab..14f7c0c 100644
--- a/source/winbindd/winbindd_rpc.c
+++ b/source/winbindd/winbindd_rpc.c
@@ -855,14 +855,15 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain 
*domain,
}
 
for (r=0; rtmp_names.count; r++) {
-   (*names)[i+r] = fill_domain_username_talloc(mem_ctx,
-   domain-name,
-   tmp_names.names[r].string,
-   true);
-   (*name_types)[i+r] = tmp_types.ids[r];
+   if (tmp_types.ids[r] == SID_NAME_UNKNOWN) {
+   continue;
+   }
+   (*names)[total_names] = fill_domain_username_talloc(
+   mem_ctx, domain-name,
+   tmp_names.names[r].string, true);
+   (*name_types)[total_names] = tmp_types.ids[r];
+   total_names += 1;
}
-
-   total_names += tmp_names.count;
 }
 
 *num_names = total_names;


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-449-ga1cf98a

[Volker Lendecke]

The branch, v3-4-test has been updated
   via  a1cf98a2458a7f7a08531832bd29da3962ddafc9 (commit)
  from  fa9d1f633796bff86e899b48e3ea8bb77492c10b (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -
commit a1cf98a2458a7f7a08531832bd29da3962ddafc9
Author: Volker Lendecke v...@samba.org
Date:   Mon Mar 16 13:17:04 2009 +0100

Fix #6130: Don't crash in winbindd_rpc lookup_groupmem() on unmapped members

Thanks to François Legal de...@thom.fr.eu.org for reporting this bug

---

Summary of changes:
 source3/winbindd/winbindd_rpc.c |   15 ---
 1 files changed, 8 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index 0070bde..2c0222e 100644
--- a/source3/winbindd/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
@@ -857,14 +857,15 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain 
*domain,
}
 
for (r=0; rtmp_names.count; r++) {
-   (*names)[i+r] = fill_domain_username_talloc(mem_ctx,
-   domain-name,
-   tmp_names.names[r].string,
-   true);
-   (*name_types)[i+r] = tmp_types.ids[r];
+   if (tmp_types.ids[r] == SID_NAME_UNKNOWN) {
+   continue;
+   }
+   (*names)[total_names] = fill_domain_username_talloc(
+   mem_ctx, domain-name,
+   tmp_names.names[r].string, true);
+   (*name_types)[total_names] = tmp_types.ids[r];
+   total_names += 1;
}
-
-   total_names += tmp_names.count;
 }
 
 *num_names = total_names;


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-494-gb29c69f

[Volker Lendecke]

The branch, master has been updated
   via  b29c69f45953bf099f1d4f6e6abd5726f5ac793e (commit)
  from  e95d0b548e344dbc8cb3dd0a0f29854711bd0cac (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit b29c69f45953bf099f1d4f6e6abd5726f5ac793e
Author: Volker Lendecke v...@samba.org
Date:   Mon Mar 16 13:17:04 2009 +0100

Fix #6130: Don't crash in winbindd_rpc lookup_groupmem() on unmapped members

Thanks to François Legal de...@thom.fr.eu.org for reporting this bug

---

Summary of changes:
 source3/winbindd/winbindd_rpc.c |   15 ---
 1 files changed, 8 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index 0070bde..2c0222e 100644
--- a/source3/winbindd/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
@@ -857,14 +857,15 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain 
*domain,
}
 
for (r=0; rtmp_names.count; r++) {
-   (*names)[i+r] = fill_domain_username_talloc(mem_ctx,
-   domain-name,
-   tmp_names.names[r].string,
-   true);
-   (*name_types)[i+r] = tmp_types.ids[r];
+   if (tmp_types.ids[r] == SID_NAME_UNKNOWN) {
+   continue;
+   }
+   (*names)[total_names] = fill_domain_username_talloc(
+   mem_ctx, domain-name,
+   tmp_names.names[r].string, true);
+   (*name_types)[total_names] = tmp_types.ids[r];
+   total_names += 1;
}
-
-   total_names += tmp_names.count;
 }
 
 *num_names = total_names;


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-497-g211e255

[Tim Prouty]

The branch, master has been updated
   via  211e2555690afc0436c2bafb7ef8d426564cc680 (commit)
   via  7bf2a213cd589e1f0f80faab343aea30263046c2 (commit)
   via  6c08e329fa9396474b200fe7593d4a5c2082930a (commit)
  from  b29c69f45953bf099f1d4f6e6abd5726f5ac793e (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 211e2555690afc0436c2bafb7ef8d426564cc680
Author: Zach Loafman zachary.loaf...@isilon.com
Date:   Mon Mar 16 09:24:06 2009 -0700

s4 torture: Win7 has a slightly different allowed access mask

Still investigating.

commit 7bf2a213cd589e1f0f80faab343aea30263046c2
Author: Zach Loafman zachary.loaf...@isilon.com
Date:   Fri Mar 13 09:04:33 2009 -0700

s4 torture: Add a string version for NT_STATUS_WIN7_INVALID_RANGE

Also submitted a request to cifs-protocol for a real name for this
thing. Use win7 target logic in smb2 lock test, SMB2-LOCK now passes
against Win7.

commit 6c08e329fa9396474b200fe7593d4a5c2082930a
Author: Zach Loafman zachary.loaf...@isilon.com
Date:   Thu Mar 12 08:32:58 2009 -0700

s4 libcli: Add SMB2.1 dialect to libcli

Negotiate 2.1 if possible, leave negotiate results in
transport-negotiate.dialect_revision.

---

Summary of changes:
 source4/libcli/smb2/connect.c |3 ++-
 source4/libcli/smb2/smb2.h|4 +++-
 source4/libcli/util/nterr.c   |1 +
 source4/torture/smb2/create.c |8 +++-
 source4/torture/smb2/lock.c   |   39 +--
 5 files changed, 42 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/libcli/smb2/connect.c b/source4/libcli/smb2/connect.c
index 11bec42..3fd9a38 100644
--- a/source4/libcli/smb2/connect.c
+++ b/source4/libcli/smb2/connect.c
@@ -108,6 +108,7 @@ static void continue_negprot(struct smb2_request *req)
transport-negotiate.system_time = state-negprot.out.system_time;
transport-negotiate.server_start_time = 
state-negprot.out.server_start_time;
transport-negotiate.security_mode = state-negprot.out.security_mode;
+   transport-negotiate.dialect_revision = 
state-negprot.out.dialect_revision;
 
switch (transport-options.signing) {
case SMB_SIGNING_OFF:
@@ -187,7 +188,7 @@ static void continue_socket(struct composite_context *creq)
state-negprot.in.capabilities  = 0;
unix_to_nt_time(state-negprot.in.start_time, time(NULL));
dialects[0] = SMB2_DIALECT_REVISION;
-   dialects[1] = 0;
+   dialects[1] = SMB21_DIALECT_REVISION;
state-negprot.in.dialects = dialects;
 
req = smb2_negprot_send(transport, state-negprot);
diff --git a/source4/libcli/smb2/smb2.h b/source4/libcli/smb2/smb2.h
index d1d5b84..3cc3ec2 100644
--- a/source4/libcli/smb2/smb2.h
+++ b/source4/libcli/smb2/smb2.h
@@ -35,6 +35,7 @@ struct smb2_negotiate {
NTTIME system_time;
NTTIME server_start_time;
uint16_t security_mode;
+   uint16_t dialect_revision;
 };
 
 /* this is the context for the smb2 transport layer */
@@ -226,8 +227,9 @@ struct smb2_request {
 
 #define SMB2_MAGIC 0x424D53FE /* 0xFE 'S' 'M' 'B' */
 
-/* the dialect we support */
+/* the dialects we support */
 #define SMB2_DIALECT_REVISION   0x202
+#define SMB21_DIALECT_REVISION  0x210
 
 /* SMB2 negotiate security_mode */
 #define SMB2_NEGOTIATE_SIGNING_ENABLED   0x01
diff --git a/source4/libcli/util/nterr.c b/source4/libcli/util/nterr.c
index 4e7cdf5..7f544b5 100644
--- a/source4/libcli/util/nterr.c
+++ b/source4/libcli/util/nterr.c
@@ -549,6 +549,7 @@ static const nt_err_code_struct nt_errs[] =
{ NT_STATUS_OBJECTID_NOT_FOUND, NT_STATUS_OBJECTID_NOT_FOUND },
{ NT_STATUS_DOWNGRADE_DETECTED, NT_STATUS_DOWNGRADE_DETECTED },
{ NT_STATUS_DS_BUSY, NT_STATUS_DS_BUSY },
+   { XXX_INVALID_RANGE, NT_STATUS_WIN7_INVALID_RANGE },
{ STATUS_MORE_ENTRIES, STATUS_MORE_ENTRIES },
{ STATUS_SOME_UNMAPPED, STATUS_SOME_UNMAPPED },
{ STATUS_NOTIFY_CLEANUP, STATUS_NOTIFY_CLEANUP },
diff --git a/source4/torture/smb2/create.c b/source4/torture/smb2/create.c
index 6d898a1..febfbe0 100644
--- a/source4/torture/smb2/create.c
+++ b/source4/torture/smb2/create.c
@@ -43,6 +43,8 @@
return false;   \
}} while (0)
 
+#define TARGET_IS_WIN7(_tctx) (torture_setting_bool(_tctx, win7, false))
+
 /*
   test some interesting combinations found by gentest
  */
@@ -160,7 +162,11 @@ static bool test_create_gentest(struct torture_context 
*torture, struct smb2_tre
}
}
 
-   CHECK_EQUAL(access_mask, 0x0df0fe00);
+   if (TARGET_IS_WIN7(torture)) {
+   CHECK_EQUAL(access_mask, 0x0de0fe00);
+   } else {
+   CHECK_EQUAL(access_mask, 0x0df0fe00);
+   }
 

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-498-gc6b570c

[Michael Adam]

The branch, master has been updated
   via  c6b570ce30b5cc3631c0ed780826d5450f681800 (commit)
  from  211e2555690afc0436c2bafb7ef8d426564cc680 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit c6b570ce30b5cc3631c0ed780826d5450f681800
Author: Steve Langasek vor...@debian.org
Date:   Tue Mar 17 22:08:28 2009 +0100

s3: Fix bugs in the detection of the GNU ld version (Bug #6147)

This bug results in a failure to use linker scripts to limit the set of 
symbols
exported by our shared libraries.

Signed-off-by: Michael Adam ob...@samba.org

---

Summary of changes:
 source3/configure.in |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 2c7c182..993290d 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -285,7 +285,7 @@ if test $ac_cv_prog_gnu_ld = yes; then
 else
AC_MSG_CHECKING(GNU ld release version)
changequote(,)dnl
-   ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | sed -n 
's,^.*\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
+   ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | sed -n 
's,^.*[^0-9\.]\+\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
ac_cv_gnu_ld_vernr_major=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 
1`
ac_cv_gnu_ld_vernr_minor=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 
2`
changequote([,])dnl
@@ -297,7 +297,7 @@ if test $ac_cv_prog_gnu_ld = yes; then
if test $ac_cv_gnu_ld_vernr_major -lt 2 || test 
$ac_cv_gnu_ld_vernr_minor -lt 14; then
  ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
fi
-   if test $ac_cv_gnu_ld_vernr_major -gt 2 || test 
$ac_cv_gnu_ld_vernr_major=2  test $ac_cv_gnu_ld_vernr_minor -ge 12; then
+   if test $ac_cv_gnu_ld_vernr_major -gt 2 || test 
$ac_cv_gnu_ld_vernr_major = 2  test $ac_cv_gnu_ld_vernr_minor -ge 12; then
  ac_cv_gnu_ld_version_script=yes
fi
 fi


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-500-g4d70153

[Günther Deschner]

The branch, master has been updated
   via  4d701536bfc8b44c1c6babc2d6a32840c67bef9a (commit)
   via  b12c3178efd3e640fc5de6418d2fb0074dd84d4e (commit)
  from  c6b570ce30b5cc3631c0ed780826d5450f681800 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 4d701536bfc8b44c1c6babc2d6a32840c67bef9a
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 20:52:58 2009 +0100

s3: re-run make samba3-idl.

Guenther

commit b12c3178efd3e640fc5de6418d2fb0074dd84d4e
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 21:09:36 2009 +0100

spoolss: add spoolss_PrinterEnumValues.

Guenther

---

Summary of changes:
 librpc/gen_ndr/ndr_spoolss.c |  142 ++
 librpc/gen_ndr/ndr_spoolss.h |4 +
 librpc/gen_ndr/spoolss.h |8 +++
 librpc/idl/spoolss.idl   |9 +++
 4 files changed, 163 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c
index b95f4c2..ba80b0e 100644
--- a/librpc/gen_ndr/ndr_spoolss.c
+++ b/librpc/gen_ndr/ndr_spoolss.c
@@ -18231,6 +18231,148 @@ _PUBLIC_ void ndr_print_spoolss_AccessRights(struct 
ndr_print *ndr, const char *
ndr-depth--;
 }
 
+_PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterEnumValues(struct ndr_push 
*ndr, int ndr_flags, const struct spoolss_PrinterEnumValues *r)
+{
+   uint32_t _save_relative_base_offset = 
ndr_push_get_relative_base_offset(ndr);
+   if (ndr_flags  NDR_SCALARS) {
+   NDR_CHECK(ndr_push_align(ndr, 4));
+   NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, 
ndr-offset));
+   {
+   uint32_t _flags_save_string = ndr-flags;
+   ndr_set_flags(ndr-flags, LIBNDR_FLAG_STR_NULLTERM);
+   NDR_CHECK(ndr_push_relative_ptr1(ndr, r-value_name));
+   ndr-flags = _flags_save_string;
+   }
+   NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 2 * 
strlen_m_term(r-value_name)));
+   NDR_CHECK(ndr_push_winreg_Type(ndr, NDR_SCALARS, r-type));
+   NDR_CHECK(ndr_push_relative_ptr1(ndr, r-data));
+   NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 
ndr_size_spoolss_PrinterData(r-data, r-type, ndr-iconv_convenience, 
ndr-flags)));
+   }
+   if (ndr_flags  NDR_BUFFERS) {
+   NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r));
+   {
+   uint32_t _flags_save_string = ndr-flags;
+   ndr_set_flags(ndr-flags, LIBNDR_FLAG_STR_NULLTERM);
+   if (r-value_name) {
+   NDR_CHECK(ndr_push_relative_ptr2(ndr, 
r-value_name));
+   NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, 
r-value_name));
+   }
+   ndr-flags = _flags_save_string;
+   }
+   if (r-data) {
+   NDR_CHECK(ndr_push_relative_ptr2(ndr, r-data));
+   {
+   struct ndr_push *_ndr_data;
+   NDR_CHECK(ndr_push_subcontext_start(ndr, 
_ndr_data, 0, ndr_size_spoolss_PrinterData(r-data, r-type, 
ndr-iconv_convenience, ndr-flags)));
+   NDR_CHECK(ndr_push_set_switch_value(_ndr_data, 
r-data, r-type));
+   
NDR_CHECK(ndr_push_spoolss_PrinterData(_ndr_data, NDR_SCALARS|NDR_BUFFERS, 
r-data));
+   NDR_CHECK(ndr_push_subcontext_end(ndr, 
_ndr_data, 0, ndr_size_spoolss_PrinterData(r-data, r-type, 
ndr-iconv_convenience, ndr-flags)));
+   }
+   }
+   }
+   ndr_push_restore_relative_base_offset(ndr, _save_relative_base_offset);
+   return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterEnumValues(struct ndr_pull 
*ndr, int ndr_flags, struct spoolss_PrinterEnumValues *r)
+{
+   uint32_t _save_relative_base_offset = 
ndr_pull_get_relative_base_offset(ndr);
+   uint32_t _ptr_value_name;
+   TALLOC_CTX *_mem_save_value_name_0;
+   uint32_t _ptr_data;
+   TALLOC_CTX *_mem_save_data_0;
+   if (ndr_flags  NDR_SCALARS) {
+   NDR_CHECK(ndr_pull_align(ndr, 4));
+   NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, 
ndr-offset));
+   {
+   uint32_t _flags_save_string = ndr-flags;
+   ndr_set_flags(ndr-flags, LIBNDR_FLAG_STR_NULLTERM);
+   NDR_CHECK(ndr_pull_generic_ptr(ndr, _ptr_value_name));
+   if (_ptr_value_name) {
+   NDR_PULL_ALLOC(ndr, r-value_name);
+   

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-451-gdc969f1

[Günther Deschner]

The branch, v3-4-test has been updated
   via  dc969f18d429cdb6277d1f7b3fe7b087cf86924a (commit)
   via  8ed5eaf07d024cc7aad1da03d32bbc5b445da31a (commit)
  from  a1cf98a2458a7f7a08531832bd29da3962ddafc9 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -
commit dc969f18d429cdb6277d1f7b3fe7b087cf86924a
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 20:52:58 2009 +0100

s3: re-run make samba3-idl.

Guenther
(cherry picked from commit 4d701536bfc8b44c1c6babc2d6a32840c67bef9a)

commit 8ed5eaf07d024cc7aad1da03d32bbc5b445da31a
Author: Günther Deschner g...@samba.org
Date:   Mon Mar 16 21:09:36 2009 +0100

spoolss: add spoolss_PrinterEnumValues.

Guenther
(cherry picked from commit b12c3178efd3e640fc5de6418d2fb0074dd84d4e)

---

Summary of changes:
 librpc/gen_ndr/ndr_spoolss.c |  142 ++
 librpc/gen_ndr/ndr_spoolss.h |4 +
 librpc/gen_ndr/spoolss.h |8 +++
 librpc/idl/spoolss.idl   |9 +++
 4 files changed, 163 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c
index b95f4c2..ba80b0e 100644
--- a/librpc/gen_ndr/ndr_spoolss.c
+++ b/librpc/gen_ndr/ndr_spoolss.c
@@ -18231,6 +18231,148 @@ _PUBLIC_ void ndr_print_spoolss_AccessRights(struct 
ndr_print *ndr, const char *
ndr-depth--;
 }
 
+_PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterEnumValues(struct ndr_push 
*ndr, int ndr_flags, const struct spoolss_PrinterEnumValues *r)
+{
+   uint32_t _save_relative_base_offset = 
ndr_push_get_relative_base_offset(ndr);
+   if (ndr_flags  NDR_SCALARS) {
+   NDR_CHECK(ndr_push_align(ndr, 4));
+   NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, 
ndr-offset));
+   {
+   uint32_t _flags_save_string = ndr-flags;
+   ndr_set_flags(ndr-flags, LIBNDR_FLAG_STR_NULLTERM);
+   NDR_CHECK(ndr_push_relative_ptr1(ndr, r-value_name));
+   ndr-flags = _flags_save_string;
+   }
+   NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 2 * 
strlen_m_term(r-value_name)));
+   NDR_CHECK(ndr_push_winreg_Type(ndr, NDR_SCALARS, r-type));
+   NDR_CHECK(ndr_push_relative_ptr1(ndr, r-data));
+   NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 
ndr_size_spoolss_PrinterData(r-data, r-type, ndr-iconv_convenience, 
ndr-flags)));
+   }
+   if (ndr_flags  NDR_BUFFERS) {
+   NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r));
+   {
+   uint32_t _flags_save_string = ndr-flags;
+   ndr_set_flags(ndr-flags, LIBNDR_FLAG_STR_NULLTERM);
+   if (r-value_name) {
+   NDR_CHECK(ndr_push_relative_ptr2(ndr, 
r-value_name));
+   NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, 
r-value_name));
+   }
+   ndr-flags = _flags_save_string;
+   }
+   if (r-data) {
+   NDR_CHECK(ndr_push_relative_ptr2(ndr, r-data));
+   {
+   struct ndr_push *_ndr_data;
+   NDR_CHECK(ndr_push_subcontext_start(ndr, 
_ndr_data, 0, ndr_size_spoolss_PrinterData(r-data, r-type, 
ndr-iconv_convenience, ndr-flags)));
+   NDR_CHECK(ndr_push_set_switch_value(_ndr_data, 
r-data, r-type));
+   
NDR_CHECK(ndr_push_spoolss_PrinterData(_ndr_data, NDR_SCALARS|NDR_BUFFERS, 
r-data));
+   NDR_CHECK(ndr_push_subcontext_end(ndr, 
_ndr_data, 0, ndr_size_spoolss_PrinterData(r-data, r-type, 
ndr-iconv_convenience, ndr-flags)));
+   }
+   }
+   }
+   ndr_push_restore_relative_base_offset(ndr, _save_relative_base_offset);
+   return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterEnumValues(struct ndr_pull 
*ndr, int ndr_flags, struct spoolss_PrinterEnumValues *r)
+{
+   uint32_t _save_relative_base_offset = 
ndr_pull_get_relative_base_offset(ndr);
+   uint32_t _ptr_value_name;
+   TALLOC_CTX *_mem_save_value_name_0;
+   uint32_t _ptr_data;
+   TALLOC_CTX *_mem_save_data_0;
+   if (ndr_flags  NDR_SCALARS) {
+   NDR_CHECK(ndr_pull_align(ndr, 4));
+   NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, 
ndr-offset));
+   {
+   uint32_t _flags_save_string = ndr-flags;
+   ndr_set_flags(ndr-flags, LIBNDR_FLAG_STR_NULLTERM);
+   NDR_CHECK(ndr_pull_generic_ptr(ndr, _ptr_value_name));
+   if 

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-501-g153a837

[Günther Deschner]

The branch, master has been updated
   via  153a837bd61338c0b912c43458900224de0654f7 (commit)
  from  4d701536bfc8b44c1c6babc2d6a32840c67bef9a (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 153a837bd61338c0b912c43458900224de0654f7
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 20:50:59 2009 +0100

s3-rpcclient: say that we are displaying a REG_MULTI_SZ in 
display_reg_value().

Guenther

---

Summary of changes:
 source3/rpcclient/cmd_spoolss.c |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index aba2939..6dac397 100644
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -682,6 +682,7 @@ static void display_reg_value(REGISTRY_VALUE value)
break;
}
 
+   printf(%s: REG_MULTI_SZ: \n, value.valuename);
for (i=0; inum_values; i++) {
d_printf(%s\n, values[i]);
}


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-452-g41da9ad

[Günther Deschner]

The branch, v3-4-test has been updated
   via  41da9adb19170094dc8825e1ee818ba4bec51722 (commit)
  from  dc969f18d429cdb6277d1f7b3fe7b087cf86924a (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -
commit 41da9adb19170094dc8825e1ee818ba4bec51722
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 20:50:59 2009 +0100

s3-rpcclient: say that we are displaying a REG_MULTI_SZ in 
display_reg_value().

Guenther
(cherry picked from commit 153a837bd61338c0b912c43458900224de0654f7)

---

Summary of changes:
 source3/rpcclient/cmd_spoolss.c |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index aba2939..6dac397 100644
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -682,6 +682,7 @@ static void display_reg_value(REGISTRY_VALUE value)
break;
}
 
+   printf(%s: REG_MULTI_SZ: \n, value.valuename);
for (i=0; inum_values; i++) {
d_printf(%s\n, values[i]);
}


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3507-g6efb624

[Jeremy Allison]

The branch, v3-2-test has been updated
   via  6efb624135a672babaad1459ff1f21b61281780e (commit)
   via  8ffe7b07df753568d960155c27d57de2bd3f (commit)
  from  e6a23d498bfd4bbe19cecf24ba3f94af83c9bf8b (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -
commit 6efb624135a672babaad1459ff1f21b61281780e
Merge: 8ffe7b07df753568d960155c27d57de2bd3f 
e6a23d498bfd4bbe19cecf24ba3f94af83c9bf8b
Author: Jeremy Allison j...@samba.org
Date:   Tue Mar 17 14:49:00 2009 -0700

Merge branch 'v3-2-test' of ssh://j...@git.samba.org/data/git/samba into 
v3-2-test

commit 8ffe7b07df753568d960155c27d57de2bd3f
Author: Volker Lendecke v...@samba.org
Date:   Tue Mar 17 11:22:41 2009 +0100

Fix a valgrind error

Found in make test -- if we can't connect at all, cli is uninitialized

---

Summary of changes:
 source/winbindd/winbindd_cm.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/winbindd/winbindd_cm.c b/source/winbindd/winbindd_cm.c
index a139b32..8e4c612 100644
--- a/source/winbindd/winbindd_cm.c
+++ b/source/winbindd/winbindd_cm.c
@@ -1747,7 +1747,7 @@ static void set_dc_type_and_flags_connect( struct 
winbindd_domain *domain )
NTSTATUSresult;
WERROR werr;
TALLOC_CTX  *mem_ctx = NULL;
-   struct rpc_pipe_client  *cli;
+   struct rpc_pipe_client  *cli = NULL;
POLICY_HND pol;
union dssetup_DsRoleInfo info;
union lsa_PolicyInformation *lsa_info = NULL;


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-502-g8dd1faa

[Jeremy Allison]

The branch, master has been updated
   via  8dd1faaa2992851f6852ba7ea4498445af5faadd (commit)
  from  153a837bd61338c0b912c43458900224de0654f7 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 8dd1faaa2992851f6852ba7ea4498445af5faadd
Author: Jeremy Allison j...@samba.org
Date:   Tue Mar 17 14:53:06 2009 -0700

Remove the global struct cm_cred_struct and associated calls, make
callers pass in a struct user_auth_info * instead. This commit causes
smbc_set_credentials() to print out a message telling callers to use
smbc_set_credentials_with_fallback() instead, as smbc_set_credentials()
has a broken API (no SMBCCTX * pointer). No more global variables used
in the connection manager API for client dfs calls.
Jeremy.

---

Summary of changes:
 source3/client/client.c   |   78 ++--
 source3/include/libsmb_internal.h |6 ++
 source3/include/popt_common.h |1 +
 source3/include/proto.h   |   15 ++---
 source3/lib/netapi/cm.c   |   32 
 source3/lib/util.c|   40 ++
 source3/libsmb/clidfs.c   |  143 
 source3/libsmb/libsmb_context.c   |   59 +---
 source3/libsmb/libsmb_dir.c   |   37 ++
 source3/libsmb/libsmb_file.c  |   35 ++
 source3/libsmb/libsmb_stat.c  |5 +-
 source3/libsmb/libsmb_xattr.c |   37 +-
 source3/rpcclient/rpcclient.c |7 +--
 source3/utils/net_rpc.c   |2 +-
 source3/utils/smbcacls.c  |7 +--
 source3/utils/smbcquotas.c|7 +--
 source3/utils/smbtree.c   |7 +--
 17 files changed, 262 insertions(+), 256 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/client/client.c b/source3/client/client.c
index 6491f39..a6f31bc 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -103,6 +103,9 @@ struct cli_state *cli;
 static char CLI_DIRSEP_CHAR = '\\';
 static char CLI_DIRSEP_STR[] = { '\\', '\0' };
 
+/* Authentication for client connections. */
+struct user_auth_info *auth_info;
+
 /* Accessor functions for directory paths. */
 static char *fileselection;
 static const char *client_get_fileselection(void)
@@ -299,7 +302,7 @@ static int do_dskattr(void)
char *targetpath = NULL;
TALLOC_CTX *ctx = talloc_tos();
 
-   if ( !cli_resolve_path(ctx, , cli, client_get_cur_dir(), targetcli, 
targetpath)) {
+   if ( !cli_resolve_path(ctx, , auth_info, cli, client_get_cur_dir(), 
targetcli, targetpath)) {
d_printf(Error in dskattr: %s\n, cli_errstr(cli));
return 1;
}
@@ -393,7 +396,7 @@ static int do_cd(const char *new_dir)
new_cd = clean_name(ctx, new_cd);
client_set_cur_dir(new_cd);
 
-   if ( !cli_resolve_path(ctx, , cli, new_cd, targetcli, targetpath)) {
+   if ( !cli_resolve_path(ctx, , auth_info, cli, new_cd, targetcli, 
targetpath)) {
d_printf(cd %s: %s\n, new_cd, cli_errstr(cli));
client_set_cur_dir(saved_dir);
goto out;
@@ -819,7 +822,7 @@ void do_list(const char *mask,
 
/* check for dfs */
 
-   if ( !cli_resolve_path(ctx, , cli, head, targetcli, 
targetpath ) ) {
+   if ( !cli_resolve_path(ctx, , auth_info, cli, head, 
targetcli, targetpath ) ) {
d_printf(do_list: [%s] %s\n, head, 
cli_errstr(cli));
remove_do_list_queue_head();
continue;
@@ -852,7 +855,7 @@ void do_list(const char *mask,
}
} else {
/* check for dfs */
-   if (cli_resolve_path(ctx, , cli, mask, targetcli, 
targetpath)) {
+   if (cli_resolve_path(ctx, , auth_info, cli, mask, targetcli, 
targetpath)) {
if (cli_list(targetcli, targetpath, attribute, 
do_list_helper, NULL) == -1) {
d_printf(%s listing %s\n,
cli_errstr(targetcli), targetpath);
@@ -1018,7 +1021,7 @@ static int do_get(const char *rname, const char 
*lname_in, bool reget)
strlower_m(lname);
}
 
-   if (!cli_resolve_path(ctx, , cli, rname, targetcli, targetname ) ) {
+   if (!cli_resolve_path(ctx, , auth_info, cli, rname, targetcli, 
targetname ) ) {
d_printf(Failed to open %s: %s\n, rname, cli_errstr(cli));
return 1;
}
@@ -1381,7 +1384,7 @@ static bool do_mkdir(const char *name)
struct cli_state *targetcli;
char *targetname = NULL;
 
-   if (!cli_resolve_path(ctx, , cli, name, targetcli, targetname)) {
+   if (!cli_resolve_path(ctx, , auth_info, cli, name, targetcli, 

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-454-g8b44877

[Jeremy Allison]

The branch, v3-4-test has been updated
   via  8b44877eb82c1c9270cb8099fefc621922f82719 (commit)
   via  b0dedecf48921efba2dbc8da409cdf878cecb495 (commit)
  from  41da9adb19170094dc8825e1ee818ba4bec51722 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -
commit 8b44877eb82c1c9270cb8099fefc621922f82719
Author: Jeremy Allison j...@samba.org
Date:   Tue Mar 17 15:01:20 2009 -0700

Remove the global struct cm_cred_struct and associated calls, make
callers pass in a struct user_auth_info * instead. This commit causes
smbc_set_credentials() to print out a message telling callers to use
smbc_set_credentials_with_fallback() instead, as smbc_set_credentials()
has a broken API (no SMBCCTX * pointer). No more global variables used
in the connection manager API for client dfs calls.
Jeremy.

commit b0dedecf48921efba2dbc8da409cdf878cecb495
Author: Jeremy Allison j...@samba.org
Date:   Tue Mar 17 15:01:10 2009 -0700

Add some appropriate const.
Jeremy.

---

Summary of changes:
 source3/client/client.c   |   78 ++--
 source3/include/libsmb_internal.h |6 ++
 source3/include/popt_common.h |1 +
 source3/include/proto.h   |   31 -
 source3/lib/netapi/cm.c   |   32 
 source3/lib/util.c|   56 --
 source3/libsmb/clidfs.c   |  143 
 source3/libsmb/libsmb_context.c   |   59 +---
 source3/libsmb/libsmb_dir.c   |   37 ++
 source3/libsmb/libsmb_file.c  |   35 ++
 source3/libsmb/libsmb_stat.c  |5 +-
 source3/libsmb/libsmb_xattr.c |   37 +-
 source3/rpcclient/rpcclient.c |7 +--
 source3/utils/net_rpc.c   |2 +-
 source3/utils/smbcacls.c  |7 +--
 source3/utils/smbcquotas.c|7 +--
 source3/utils/smbtree.c   |7 +--
 17 files changed, 278 insertions(+), 272 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/client/client.c b/source3/client/client.c
index 6491f39..a6f31bc 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -103,6 +103,9 @@ struct cli_state *cli;
 static char CLI_DIRSEP_CHAR = '\\';
 static char CLI_DIRSEP_STR[] = { '\\', '\0' };
 
+/* Authentication for client connections. */
+struct user_auth_info *auth_info;
+
 /* Accessor functions for directory paths. */
 static char *fileselection;
 static const char *client_get_fileselection(void)
@@ -299,7 +302,7 @@ static int do_dskattr(void)
char *targetpath = NULL;
TALLOC_CTX *ctx = talloc_tos();
 
-   if ( !cli_resolve_path(ctx, , cli, client_get_cur_dir(), targetcli, 
targetpath)) {
+   if ( !cli_resolve_path(ctx, , auth_info, cli, client_get_cur_dir(), 
targetcli, targetpath)) {
d_printf(Error in dskattr: %s\n, cli_errstr(cli));
return 1;
}
@@ -393,7 +396,7 @@ static int do_cd(const char *new_dir)
new_cd = clean_name(ctx, new_cd);
client_set_cur_dir(new_cd);
 
-   if ( !cli_resolve_path(ctx, , cli, new_cd, targetcli, targetpath)) {
+   if ( !cli_resolve_path(ctx, , auth_info, cli, new_cd, targetcli, 
targetpath)) {
d_printf(cd %s: %s\n, new_cd, cli_errstr(cli));
client_set_cur_dir(saved_dir);
goto out;
@@ -819,7 +822,7 @@ void do_list(const char *mask,
 
/* check for dfs */
 
-   if ( !cli_resolve_path(ctx, , cli, head, targetcli, 
targetpath ) ) {
+   if ( !cli_resolve_path(ctx, , auth_info, cli, head, 
targetcli, targetpath ) ) {
d_printf(do_list: [%s] %s\n, head, 
cli_errstr(cli));
remove_do_list_queue_head();
continue;
@@ -852,7 +855,7 @@ void do_list(const char *mask,
}
} else {
/* check for dfs */
-   if (cli_resolve_path(ctx, , cli, mask, targetcli, 
targetpath)) {
+   if (cli_resolve_path(ctx, , auth_info, cli, mask, targetcli, 
targetpath)) {
if (cli_list(targetcli, targetpath, attribute, 
do_list_helper, NULL) == -1) {
d_printf(%s listing %s\n,
cli_errstr(targetcli), targetpath);
@@ -1018,7 +1021,7 @@ static int do_get(const char *rname, const char 
*lname_in, bool reget)
strlower_m(lname);
}
 
-   if (!cli_resolve_path(ctx, , cli, rname, targetcli, targetname ) ) {
+   if (!cli_resolve_path(ctx, , auth_info, cli, rname, targetcli, 
targetname ) ) {
d_printf(Failed to open %s: %s\n, rname, cli_errstr(cli));
return 1;
}
@@ -1381,7 +1384,7 @@ static bool 

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-504-ga3d0499

[Michael Adam]

The branch, master has been updated
   via  a3d04991ef409591a7c8b9fbb01e024bd5aaa041 (commit)
   via  e8aa7169a6672bd32af6c5580f6e8ec7e99511bc (commit)
  from  8dd1faaa2992851f6852ba7ea4498445af5faadd (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit a3d04991ef409591a7c8b9fbb01e024bd5aaa041
Author: Timur ti...@freebsd.org
Date:   Tue Mar 17 22:46:53 2009 +0100

build: fix detection of netinet/ip.h on FreeBSD

Signed-off-by: Michael Adam ob...@samba.org

commit e8aa7169a6672bd32af6c5580f6e8ec7e99511bc
Author: Timur ti...@freebsd.org
Date:   Tue Mar 17 22:45:28 2009 +0100

build: format the header check for netinet/ip.h more nicely

Signed-off-by: Michael Adam ob...@samba.org

---

Summary of changes:
 lib/replace/libreplace_network.m4 |   15 +--
 1 files changed, 9 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/libreplace_network.m4 
b/lib/replace/libreplace_network.m4
index 9223d94..3bac72d 100644
--- a/lib/replace/libreplace_network.m4
+++ b/lib/replace/libreplace_network.m4
@@ -8,12 +8,15 @@ LIBREPLACE_NETWORK_LIBS=
 
 AC_CHECK_HEADERS(sys/socket.h netinet/in.h netdb.h arpa/inet.h)
 AC_CHECK_HEADERS(netinet/in_systm.h)
-AC_CHECK_HEADERS([netinet/ip.h], [], [],[#ifdef HAVE_NETINET_IN_H
-#include netinet/in.h
-#endif
-#ifdef HAVE_NETINET_IN_SYSTM_H
-#include netinet/in_systm.h
-#endif])
+AC_CHECK_HEADERS([netinet/ip.h], [], [],[
+   #include sys/types.h
+   #ifdef HAVE_NETINET_IN_H
+   #include netinet/in.h
+   #endif
+   #ifdef HAVE_NETINET_IN_SYSTM_H
+   #include netinet/in_systm.h
+   #endif
+])
 AC_CHECK_HEADERS(netinet/tcp.h netinet/in_ip.h)
 AC_CHECK_HEADERS(sys/sockio.h sys/un.h)
 AC_CHECK_HEADERS(sys/uio.h)


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-455-g2ef50df

[Michael Adam]

The branch, v3-4-test has been updated
   via  2ef50dfeaca50ce85ed867764b050276fe2c924c (commit)
  from  8b44877eb82c1c9270cb8099fefc621922f82719 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -
commit 2ef50dfeaca50ce85ed867764b050276fe2c924c
Author: Steve Langasek vor...@debian.org
Date:   Tue Mar 17 22:08:28 2009 +0100

s3: Fix bugs in the detection of the GNU ld version (Bug #6147)

This bug results in a failure to use linker scripts to limit the set of 
symbols
exported by our shared libraries.

Signed-off-by: Michael Adam ob...@samba.org
(cherry picked from commit c6b570ce30b5cc3631c0ed780826d5450f681800)

---

Summary of changes:
 source3/configure.in |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index ab5e81f..49ec3ba 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -266,7 +266,7 @@ if test $ac_cv_prog_gnu_ld = yes; then
 else
AC_MSG_CHECKING(GNU ld release version)
changequote(,)dnl
-   ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | sed -n 
's,^.*\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
+   ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | sed -n 
's,^.*[^0-9\.]\+\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
ac_cv_gnu_ld_vernr_major=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 
1`
ac_cv_gnu_ld_vernr_minor=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 
2`
changequote([,])dnl
@@ -278,7 +278,7 @@ if test $ac_cv_prog_gnu_ld = yes; then
if test $ac_cv_gnu_ld_vernr_major -lt 2 || test 
$ac_cv_gnu_ld_vernr_minor -lt 14; then
  ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
fi
-   if test $ac_cv_gnu_ld_vernr_major -gt 2 || test 
$ac_cv_gnu_ld_vernr_major=2  test $ac_cv_gnu_ld_vernr_minor -ge 12; then
+   if test $ac_cv_gnu_ld_vernr_major -gt 2 || test 
$ac_cv_gnu_ld_vernr_major = 2  test $ac_cv_gnu_ld_vernr_minor -ge 12; then
  ac_cv_gnu_ld_version_script=yes
fi
 fi


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-457-g28f233d

[Michael Adam]

The branch, v3-4-test has been updated
   via  28f233ddc010893f50b45f91ce41deaa537f11d7 (commit)
   via  46559e7b84d70f7c9e52673365303d0f7863d839 (commit)
  from  2ef50dfeaca50ce85ed867764b050276fe2c924c (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -
commit 28f233ddc010893f50b45f91ce41deaa537f11d7
Author: Timur ti...@freebsd.org
Date:   Tue Mar 17 22:46:53 2009 +0100

build: fix detection of netinet/ip.h on FreeBSD

Signed-off-by: Michael Adam ob...@samba.org
(cherry picked from commit a3d04991ef409591a7c8b9fbb01e024bd5aaa041)

commit 46559e7b84d70f7c9e52673365303d0f7863d839
Author: Timur ti...@freebsd.org
Date:   Tue Mar 17 22:45:28 2009 +0100

build: format the header check for netinet/ip.h more nicely

Signed-off-by: Michael Adam ob...@samba.org
(cherry picked from commit e8aa7169a6672bd32af6c5580f6e8ec7e99511bc)

---

Summary of changes:
 lib/replace/libreplace_network.m4 |   15 +--
 1 files changed, 9 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/libreplace_network.m4 
b/lib/replace/libreplace_network.m4
index 9223d94..3bac72d 100644
--- a/lib/replace/libreplace_network.m4
+++ b/lib/replace/libreplace_network.m4
@@ -8,12 +8,15 @@ LIBREPLACE_NETWORK_LIBS=
 
 AC_CHECK_HEADERS(sys/socket.h netinet/in.h netdb.h arpa/inet.h)
 AC_CHECK_HEADERS(netinet/in_systm.h)
-AC_CHECK_HEADERS([netinet/ip.h], [], [],[#ifdef HAVE_NETINET_IN_H
-#include netinet/in.h
-#endif
-#ifdef HAVE_NETINET_IN_SYSTM_H
-#include netinet/in_systm.h
-#endif])
+AC_CHECK_HEADERS([netinet/ip.h], [], [],[
+   #include sys/types.h
+   #ifdef HAVE_NETINET_IN_H
+   #include netinet/in.h
+   #endif
+   #ifdef HAVE_NETINET_IN_SYSTM_H
+   #include netinet/in_systm.h
+   #endif
+])
 AC_CHECK_HEADERS(netinet/tcp.h netinet/in_ip.h)
 AC_CHECK_HEADERS(sys/sockio.h sys/un.h)
 AC_CHECK_HEADERS(sys/uio.h)


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-459-ge1041f5

[Jeremy Allison]

The branch, v3-4-test has been updated
   via  e1041f5957e84b6c255c714b2bf6056cdc8f3323 (commit)
   via  49399cb3cc09213c6c44799e17d7a95afc8c8584 (commit)
  from  28f233ddc010893f50b45f91ce41deaa537f11d7 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -
commit e1041f5957e84b6c255c714b2bf6056cdc8f3323
Merge: 49399cb3cc09213c6c44799e17d7a95afc8c8584 
28f233ddc010893f50b45f91ce41deaa537f11d7
Author: Jeremy Allison j...@samba.org
Date:   Tue Mar 17 15:38:07 2009 -0700

Merge branch 'v3-4-test' of ssh://j...@git.samba.org/data/git/samba into 
v3-4-test

commit 49399cb3cc09213c6c44799e17d7a95afc8c8584
Author: Alexander Zagrebin al...@visp.ru
Date:   Tue Mar 17 15:37:19 2009 -0700

Missing break in conversion function prevents tdb password database update.

---

Summary of changes:
 source3/passdb/pdb_tdb.c |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c
index 3442561..ab26651 100644
--- a/source3/passdb/pdb_tdb.c
+++ b/source3/passdb/pdb_tdb.c
@@ -102,6 +102,7 @@ static int tdbsam_convert_one(struct db_record *rec, void 
*priv)
ret = init_samu_from_buffer(user, SAMU_BUFFER_V3,
(uint8 *)rec-value.dptr,
rec-value.dsize);
+   break;
case 4:
ret = init_samu_from_buffer(user, SAMU_BUFFER_V4,
(uint8 *)rec-value.dptr,


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-505-gb4ae0e8

[Jeremy Allison]

The branch, master has been updated
   via  b4ae0e8d84c26d548dbce9f4b6d74254725fe428 (commit)
  from  a3d04991ef409591a7c8b9fbb01e024bd5aaa041 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit b4ae0e8d84c26d548dbce9f4b6d74254725fe428
Author: Alexander Zagrebin al...@visp.ru
Date:   Tue Mar 17 15:38:33 2009 -0700

Missing break in conversion function prevents tdb password database update.

---

Summary of changes:
 source3/passdb/pdb_tdb.c |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c
index 3442561..ab26651 100644
--- a/source3/passdb/pdb_tdb.c
+++ b/source3/passdb/pdb_tdb.c
@@ -102,6 +102,7 @@ static int tdbsam_convert_one(struct db_record *rec, void 
*priv)
ret = init_samu_from_buffer(user, SAMU_BUFFER_V3,
(uint8 *)rec-value.dptr,
rec-value.dsize);
+   break;
case 4:
ret = init_samu_from_buffer(user, SAMU_BUFFER_V4,
(uint8 *)rec-value.dptr,


-- 
Samba Shared Repository

[SCM] CTDB repository - branch master updated - ctdb-1.0.74-3-gb6f7cdd

[Ronnie Sahlberg]

The branch, master has been updated
   via  b6f7cddc68508e52bc65b357b0b77258ae96362a (commit)
   via  742283a8f8da7c614ee3a30d48c430e3a3bceeb9 (commit)
   via  4c598ab6f8e9b826d437b9ab869c4490f7c4faba (commit)
  from  0772190203d501a39072f16948604742d7d59a5e (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -
commit b6f7cddc68508e52bc65b357b0b77258ae96362a
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date:   Wed Mar 18 10:05:00 2009 +1100

add documentation for the NAT-GW feature

commit 742283a8f8da7c614ee3a30d48c430e3a3bceeb9
Author: root r...@rcn1.vsofs1.com
Date:   Wed Mar 18 09:33:58 2009 +1100

change the NATGW_ example in sysconfig to make it more realistic

commit 4c598ab6f8e9b826d437b9ab869c4490f7c4faba
Author: root r...@rcn1.vsofs1.com
Date:   Tue Mar 17 07:35:53 2009 +1100

NAT-GW updates. Describe the functionality in the sysconfig file

---

Summary of changes:
 config/ctdb.sysconfig|   37 +++
 config/events.d/11.natgw |   79 ++
 doc/ctdbd.1  |  654 --
 doc/ctdbd.1.html |  117 -
 doc/ctdbd.1.xml  |  164 
 5 files changed, 625 insertions(+), 426 deletions(-)
 create mode 100644 config/events.d/11.natgw


Changeset truncated at 500 lines:

diff --git a/config/ctdb.sysconfig b/config/ctdb.sysconfig
index db5d16c..03b91b6 100644
--- a/config/ctdb.sysconfig
+++ b/config/ctdb.sysconfig
@@ -128,6 +128,43 @@
 # CTDB_CAPABILITY_RECMASTER=yes
 # CTDB_CAPABILITY_LMASTER=yes
 
+# NAT-GW configuration
+# Some services running on nthe CTDB node may need to originate traffic to
+# remote servers before the node is assigned any IP addresses,
+# This is problematic since before the node has public addresses the node might
+# not be able to route traffic to the public networks.
+# One solution is to have static public addresses assigned with routing
+# in addition to the public address interfaces, thus guaranteeing that
+# a node always can route traffic to the external network.
+# This is the most simple solution but it uses up a large number of 
+# additional ip addresses.
+#
+# A more complex solution is NAT-GW.
+# In this mode we only need one additional ip address for the cluster from
+# the exsternal public network.
+# One of the nodes in the cluster is elected to be hosting this ip address
+# so it can reach the external services. This node is also configured
+# to use NAT MASQUERADING for all traffic from the internal private network
+# to the external network. This node is the NAT-GW node.
+#
+# All other nodes are set up with policy routing so that all traffic with
+# a source address of the private network and a destination outside of
+# the private network are instead routed through the NAT-GW node.
+# 
+# The effect of this is that only when a node does not have a public address
+# or a route to the external network will the node use the private address
+# as the source address and only then will it use the policy routing
+# through the NAT-GW.
+# As long as a node has a public address and can route to the external network
+# the node will always pick the public address as the source address and NAT-GW
+# routing will not be used.
+#NATGW_PUBLIC_IP=10.0.0.227/24
+#NATGW_PUBLIC_IFACE=eth0
+#NATGW_DEFAULT_GATEWAY=10.0.0.1
+#NATGW_PRIVATE_IFACE=eth1
+#NATGW_PRIVATE_NETWORK=10.1.1.0/24
+
+
 # where to log messages
 # the default is /var/log/log.ctdb
 # CTDB_LOGFILE=/var/log/log.ctdb
diff --git a/config/events.d/11.natgw b/config/events.d/11.natgw
new file mode 100644
index 000..23fe4ae
--- /dev/null
+++ b/config/events.d/11.natgw
@@ -0,0 +1,79 @@
+#!/bin/sh
+# Script to set up one of the nodes as a NAT gateway for all other nodes.
+# This is used to ensure that all nodes in the cluster can still originate
+# traffic to the external network even if there are no public addresses
+# available.
+#
+
+. $CTDB_BASE/functions
+loadconfig ctdb
+
+[ -z $NATGW_PUBLIC_INTERFACE ]  exit 0
+
+cmd=$1
+shift
+PATH=/usr/bin:/bin:/usr/sbin:/sbin:$PATH
+
+case $cmd in 
+ recovered)
+   MYPNN=`ctdb pnn | cut -d: -f2`
+
+   # Find the first connected node
+   FIRST=`ctdb status -Y | grep :0:$ | head -1`
+   FIRSTNODE=`echo $FIRST | cut -d: -f2`
+   FIRSTIP=`echo $FIRST | cut -d: -f3`
+
+   # Delete everything that might have been set in a previous iteration
+   # when we were not the NAT-GW
+   ip rule del fwmark 11 table 11 /dev/null 2/dev/null
+   iptables -D OUTPUT -t mangle -s $NATGW_PRIVATE_NETWORK -d ! 
$NATGW_PRIVATE_NETWORK -j MARK --set-mark 11 /dev/null 2/dev/null
+   iptables -D OUTPUT -t mangle -s $NATGW_PRIVATE_NETWORK -d ! 
$NATGW_PRIVATE_NETWORK -p tcp --sport 22 -j ACCEPT /dev/null 2/dev/null
+   ip route del $NATGW_PRIVATE_NETWORK dev $NATGW_PRIVATE_IFACE table 

Build status as of Wed Mar 18 00:00:02 2009

[build]

URL: http://build.samba.org/

--- /home/build/master/cache/broken_results.txt.old 2009-03-17 
00:00:24.0 +
+++ /home/build/master/cache/broken_results.txt 2009-03-18 00:00:30.0 
+
@@ -1,4 +1,4 @@
-Build status as of Tue Mar 17 00:00:02 2009
+Build status as of Wed Mar 18 00:00:02 2009
 
 Build counts:
 Tree Total  Broken Panic 
@@ -6,15 +6,15 @@
 ccache   28 5  0 
 ctdb 0  0  0 
 distcc   0  0  0 
-ldb  28 28 0 
-libreplace   27 9  0 
+ldb  27 28 0 
+libreplace   28 9  0 
 lorikeet-heimdal 25 12 0 
 pidl 20 2  0 
 ppp  13 0  0 
 rsync28 8  0 
 samba-docs   0  0  0 
 samba-gtk5  5  0 
-samba_3_X_devel 27 27 0 
+samba_3_X_devel 27 26 0 
 samba_3_X_test 26 24 0 
 samba_4_0_test 28 27 0 
 smb-build27 4  0 

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-507-g2dae07a

[Günther Deschner]

The branch, master has been updated
   via  2dae07a3ca62670d384937df2e4e9d6f54c99619 (commit)
   via  4fb79b4fe78e89b7bbee5b280294037f43e0e2a1 (commit)
  from  b4ae0e8d84c26d548dbce9f4b6d74254725fe428 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 2dae07a3ca62670d384937df2e4e9d6f54c99619
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 18 01:07:49 2009 +0100

s3: re-run make samba3-idl.

Guenther

commit 4fb79b4fe78e89b7bbee5b280294037f43e0e2a1
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 18 00:36:54 2009 +0100

spoolss: fix spoolss_PrinterEnumValues w.r.t. size calculation of 
PrinterData.

Guenther

---

Summary of changes:
 librpc/gen_ndr/ndr_spoolss.c |4 ++--
 librpc/gen_ndr/spoolss.h |2 +-
 librpc/idl/spoolss.idl   |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c
index ba80b0e..f9781bc 100644
--- a/librpc/gen_ndr/ndr_spoolss.c
+++ b/librpc/gen_ndr/ndr_spoolss.c
@@ -18263,10 +18263,10 @@ _PUBLIC_ enum ndr_err_code 
ndr_push_spoolss_PrinterEnumValues(struct ndr_push *n
NDR_CHECK(ndr_push_relative_ptr2(ndr, r-data));
{
struct ndr_push *_ndr_data;
-   NDR_CHECK(ndr_push_subcontext_start(ndr, 
_ndr_data, 0, ndr_size_spoolss_PrinterData(r-data, r-type, 
ndr-iconv_convenience, ndr-flags)));
+   NDR_CHECK(ndr_push_subcontext_start(ndr, 
_ndr_data, 0, r-data_length));
NDR_CHECK(ndr_push_set_switch_value(_ndr_data, 
r-data, r-type));

NDR_CHECK(ndr_push_spoolss_PrinterData(_ndr_data, NDR_SCALARS|NDR_BUFFERS, 
r-data));
-   NDR_CHECK(ndr_push_subcontext_end(ndr, 
_ndr_data, 0, ndr_size_spoolss_PrinterData(r-data, r-type, 
ndr-iconv_convenience, ndr-flags)));
+   NDR_CHECK(ndr_push_subcontext_end(ndr, 
_ndr_data, 0, r-data_length));
}
}
}
diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h
index 2c6e9a6..c703c87 100644
--- a/librpc/gen_ndr/spoolss.h
+++ b/librpc/gen_ndr/spoolss.h
@@ -1483,7 +1483,7 @@ struct spoolss_PrinterEnumValues {
const char * value_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
uint32_t value_name_len;/* [value(2*strlen_m_term(value_name))] */
enum winreg_Type type;
-   union spoolss_PrinterData *data;/* 
[relative,subcontext_size(data_length),subcontext(0),switch_is(type)] */
+   union spoolss_PrinterData *data;/* 
[relative,subcontext_size(r-data_length),subcontext(0),switch_is(type)] */
uint32_t data_length;/* 
[value(ndr_size_spoolss_PrinterData(data,type,ndr-iconv_convenience,ndr-flags))]
 */
 }/* [relative_base,gensize,public] */;
 
diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl
index fc87814..59d90ec 100644
--- a/librpc/idl/spoolss.idl
+++ b/librpc/idl/spoolss.idl
@@ -2223,7 +2223,7 @@ import misc.idl, security.idl, winreg.idl;
[relative] nstring *value_name;
[value(2*strlen_m_term(value_name))] uint32 value_name_len;
winreg_Type type;
-   
[relative,switch_is(type),subcontext(0),subcontext_size(data_length)] 
spoolss_PrinterData *data;
+   
[relative,switch_is(type),subcontext(0),subcontext_size(r-data_length)] 
spoolss_PrinterData *data;
[value(ndr_size_spoolss_PrinterData(data, type, 
ndr-iconv_convenience, ndr-flags))] uint32 data_length;
} spoolss_PrinterEnumValues;
 


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-461-g2e9bd2b

[Günther Deschner]

The branch, v3-4-test has been updated
   via  2e9bd2ba8fa9ddf7324b1d9546c3112614b88f27 (commit)
   via  da934c1917833c2b3cf6154f069d6012c6d7c07b (commit)
  from  e1041f5957e84b6c255c714b2bf6056cdc8f3323 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -
commit 2e9bd2ba8fa9ddf7324b1d9546c3112614b88f27
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 18 01:07:49 2009 +0100

s3: re-run make samba3-idl.

Guenther
(cherry picked from commit 2dae07a3ca62670d384937df2e4e9d6f54c99619)

commit da934c1917833c2b3cf6154f069d6012c6d7c07b
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 18 00:36:54 2009 +0100

spoolss: fix spoolss_PrinterEnumValues w.r.t. size calculation of 
PrinterData.

Guenther
(cherry picked from commit 4fb79b4fe78e89b7bbee5b280294037f43e0e2a1)

---

Summary of changes:
 librpc/gen_ndr/ndr_spoolss.c |4 ++--
 librpc/gen_ndr/spoolss.h |2 +-
 librpc/idl/spoolss.idl   |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c
index ba80b0e..f9781bc 100644
--- a/librpc/gen_ndr/ndr_spoolss.c
+++ b/librpc/gen_ndr/ndr_spoolss.c
@@ -18263,10 +18263,10 @@ _PUBLIC_ enum ndr_err_code 
ndr_push_spoolss_PrinterEnumValues(struct ndr_push *n
NDR_CHECK(ndr_push_relative_ptr2(ndr, r-data));
{
struct ndr_push *_ndr_data;
-   NDR_CHECK(ndr_push_subcontext_start(ndr, 
_ndr_data, 0, ndr_size_spoolss_PrinterData(r-data, r-type, 
ndr-iconv_convenience, ndr-flags)));
+   NDR_CHECK(ndr_push_subcontext_start(ndr, 
_ndr_data, 0, r-data_length));
NDR_CHECK(ndr_push_set_switch_value(_ndr_data, 
r-data, r-type));

NDR_CHECK(ndr_push_spoolss_PrinterData(_ndr_data, NDR_SCALARS|NDR_BUFFERS, 
r-data));
-   NDR_CHECK(ndr_push_subcontext_end(ndr, 
_ndr_data, 0, ndr_size_spoolss_PrinterData(r-data, r-type, 
ndr-iconv_convenience, ndr-flags)));
+   NDR_CHECK(ndr_push_subcontext_end(ndr, 
_ndr_data, 0, r-data_length));
}
}
}
diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h
index 2c6e9a6..c703c87 100644
--- a/librpc/gen_ndr/spoolss.h
+++ b/librpc/gen_ndr/spoolss.h
@@ -1483,7 +1483,7 @@ struct spoolss_PrinterEnumValues {
const char * value_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
uint32_t value_name_len;/* [value(2*strlen_m_term(value_name))] */
enum winreg_Type type;
-   union spoolss_PrinterData *data;/* 
[relative,subcontext_size(data_length),subcontext(0),switch_is(type)] */
+   union spoolss_PrinterData *data;/* 
[relative,subcontext_size(r-data_length),subcontext(0),switch_is(type)] */
uint32_t data_length;/* 
[value(ndr_size_spoolss_PrinterData(data,type,ndr-iconv_convenience,ndr-flags))]
 */
 }/* [relative_base,gensize,public] */;
 
diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl
index fc87814..59d90ec 100644
--- a/librpc/idl/spoolss.idl
+++ b/librpc/idl/spoolss.idl
@@ -2223,7 +2223,7 @@ import misc.idl, security.idl, winreg.idl;
[relative] nstring *value_name;
[value(2*strlen_m_term(value_name))] uint32 value_name_len;
winreg_Type type;
-   
[relative,switch_is(type),subcontext(0),subcontext_size(data_length)] 
spoolss_PrinterData *data;
+   
[relative,switch_is(type),subcontext(0),subcontext_size(r-data_length)] 
spoolss_PrinterData *data;
[value(ndr_size_spoolss_PrinterData(data, type, 
ndr-iconv_convenience, ndr-flags))] uint32 data_length;
} spoolss_PrinterEnumValues;
 


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-510-g18a93e3

[Günther Deschner]

The branch, master has been updated
   via  18a93e3e62f29448f34f9af84aba54eedb26fe21 (commit)
   via  b1d4523f73afd83e0170bac653814b59c4d68b6e (commit)
   via  19ea2a54865f953663e30b7561b47f0a18e79faf (commit)
  from  2dae07a3ca62670d384937df2e4e9d6f54c99619 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 18a93e3e62f29448f34f9af84aba54eedb26fe21
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 18 00:35:44 2009 +0100

spoolss: add ndr_push/pull_spoolss_EnumPrinterDataEx helper.

Guenther

commit b1d4523f73afd83e0170bac653814b59c4d68b6e
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 18 01:08:38 2009 +0100

s3: re-run make samba3-idl.

Guenther

commit 19ea2a54865f953663e30b7561b47f0a18e79faf
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 18 00:36:31 2009 +0100

spoolss: add spoolss_EnumPrinterDataEx triple call.

Guenther

---

Summary of changes:
 librpc/gen_ndr/cli_spoolss.c |8 ++--
 librpc/gen_ndr/cli_spoolss.h |4 +-
 librpc/gen_ndr/ndr_spoolss.c |   87 +--
 librpc/gen_ndr/ndr_spoolss.h |6 +++
 librpc/gen_ndr/spoolss.h |   33 ++-
 librpc/gen_ndr/srv_spoolss.c |   24 +-
 librpc/idl/spoolss.idl   |   18 +++-
 librpc/ndr/ndr_spoolss_buf.c |   93 ++
 librpc/ndr/ndr_spoolss_buf.h |3 +-
 9 files changed, 230 insertions(+), 46 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/gen_ndr/cli_spoolss.c b/librpc/gen_ndr/cli_spoolss.c
index a774d21..1e94a2a 100644
--- a/librpc/gen_ndr/cli_spoolss.c
+++ b/librpc/gen_ndr/cli_spoolss.c
@@ -3758,10 +3758,10 @@ NTSTATUS rpccli_spoolss_EnumPrinterDataEx(struct 
rpc_pipe_client *cli,
  TALLOC_CTX *mem_ctx,
  struct policy_handle *handle /* [in] 
[ref] */,
  const char *key_name /* [in] 
[charset(UTF16)] */,
- uint8_t *buffer /* [out] 
[ref,size_is(offered)] */,
  uint32_t offered /* [in]  */,
- uint32_t *needed /* [out] [ref] */,
  uint32_t *count /* [out] [ref] */,
+ struct spoolss_PrinterEnumValues 
**info /* [out] [ref,size_is(,*count)] */,
+ uint32_t *needed /* [out] [ref] */,
  WERROR *werror)
 {
struct spoolss_EnumPrinterDataEx r;
@@ -3795,9 +3795,9 @@ NTSTATUS rpccli_spoolss_EnumPrinterDataEx(struct 
rpc_pipe_client *cli,
}
 
/* Return variables */
-   memcpy(buffer, r.out.buffer, r.in.offered * sizeof(*buffer));
-   *needed = *r.out.needed;
*count = *r.out.count;
+   *info = *r.out.info;
+   *needed = *r.out.needed;
 
/* Return result */
if (werror) {
diff --git a/librpc/gen_ndr/cli_spoolss.h b/librpc/gen_ndr/cli_spoolss.h
index a30b1b1..eb86e8c 100644
--- a/librpc/gen_ndr/cli_spoolss.h
+++ b/librpc/gen_ndr/cli_spoolss.h
@@ -488,10 +488,10 @@ NTSTATUS rpccli_spoolss_EnumPrinterDataEx(struct 
rpc_pipe_client *cli,
  TALLOC_CTX *mem_ctx,
  struct policy_handle *handle /* [in] 
[ref] */,
  const char *key_name /* [in] 
[charset(UTF16)] */,
- uint8_t *buffer /* [out] 
[ref,size_is(offered)] */,
  uint32_t offered /* [in]  */,
- uint32_t *needed /* [out] [ref] */,
  uint32_t *count /* [out] [ref] */,
+ struct spoolss_PrinterEnumValues 
**info /* [out] [ref,size_is(,*count)] */,
+ uint32_t *needed /* [out] [ref] */,
  WERROR *werror);
 NTSTATUS rpccli_spoolss_EnumPrinterKey(struct rpc_pipe_client *cli,
   TALLOC_CTX *mem_ctx,
diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c
index f9781bc..d340b81 100644
--- a/librpc/gen_ndr/ndr_spoolss.c
+++ b/librpc/gen_ndr/ndr_spoolss.c
@@ -26296,7 +26296,7 @@ _PUBLIC_ void ndr_print_spoolss_GetPrinterDataEx(struct 
ndr_print *ndr, const ch
ndr-depth--;
 }
 
-_PUBLIC_ enum ndr_err_code ndr_push_spoolss_EnumPrinterDataEx(struct ndr_push 
*ndr, int flags, const struct spoolss_EnumPrinterDataEx *r)
+_PUBLIC_ enum ndr_err_code ndr_push__spoolss_EnumPrinterDataEx(struct ndr_push 
*ndr, int flags, const struct _spoolss_EnumPrinterDataEx *r)
 {
  

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-464-g8150299

[Günther Deschner]

The branch, v3-4-test has been updated
   via  8150299e89339e6bcc2e4d1d30146a91f7bc1b1c (commit)
   via  481499e264cc8e7c14516b01d227ec7d4a17bb6f (commit)
   via  c39351267d6db5142a38d3cede40c1237131e79f (commit)
  from  2e9bd2ba8fa9ddf7324b1d9546c3112614b88f27 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -
commit 8150299e89339e6bcc2e4d1d30146a91f7bc1b1c
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 18 00:35:44 2009 +0100

spoolss: add ndr_push/pull_spoolss_EnumPrinterDataEx helper.

Guenther
(cherry picked from commit 18a93e3e62f29448f34f9af84aba54eedb26fe21)

commit 481499e264cc8e7c14516b01d227ec7d4a17bb6f
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 18 01:08:38 2009 +0100

s3: re-run make samba3-idl.

Guenther
(cherry picked from commit b1d4523f73afd83e0170bac653814b59c4d68b6e)

commit c39351267d6db5142a38d3cede40c1237131e79f
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 18 00:36:31 2009 +0100

spoolss: add spoolss_EnumPrinterDataEx triple call.

Guenther
(cherry picked from commit 19ea2a54865f953663e30b7561b47f0a18e79faf)

---

Summary of changes:
 librpc/gen_ndr/cli_spoolss.c |8 ++--
 librpc/gen_ndr/cli_spoolss.h |4 +-
 librpc/gen_ndr/ndr_spoolss.c |   87 +--
 librpc/gen_ndr/ndr_spoolss.h |6 +++
 librpc/gen_ndr/spoolss.h |   33 ++-
 librpc/gen_ndr/srv_spoolss.c |   24 +-
 librpc/idl/spoolss.idl   |   18 +++-
 librpc/ndr/ndr_spoolss_buf.c |   93 ++
 librpc/ndr/ndr_spoolss_buf.h |3 +-
 9 files changed, 230 insertions(+), 46 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/gen_ndr/cli_spoolss.c b/librpc/gen_ndr/cli_spoolss.c
index a774d21..1e94a2a 100644
--- a/librpc/gen_ndr/cli_spoolss.c
+++ b/librpc/gen_ndr/cli_spoolss.c
@@ -3758,10 +3758,10 @@ NTSTATUS rpccli_spoolss_EnumPrinterDataEx(struct 
rpc_pipe_client *cli,
  TALLOC_CTX *mem_ctx,
  struct policy_handle *handle /* [in] 
[ref] */,
  const char *key_name /* [in] 
[charset(UTF16)] */,
- uint8_t *buffer /* [out] 
[ref,size_is(offered)] */,
  uint32_t offered /* [in]  */,
- uint32_t *needed /* [out] [ref] */,
  uint32_t *count /* [out] [ref] */,
+ struct spoolss_PrinterEnumValues 
**info /* [out] [ref,size_is(,*count)] */,
+ uint32_t *needed /* [out] [ref] */,
  WERROR *werror)
 {
struct spoolss_EnumPrinterDataEx r;
@@ -3795,9 +3795,9 @@ NTSTATUS rpccli_spoolss_EnumPrinterDataEx(struct 
rpc_pipe_client *cli,
}
 
/* Return variables */
-   memcpy(buffer, r.out.buffer, r.in.offered * sizeof(*buffer));
-   *needed = *r.out.needed;
*count = *r.out.count;
+   *info = *r.out.info;
+   *needed = *r.out.needed;
 
/* Return result */
if (werror) {
diff --git a/librpc/gen_ndr/cli_spoolss.h b/librpc/gen_ndr/cli_spoolss.h
index a30b1b1..eb86e8c 100644
--- a/librpc/gen_ndr/cli_spoolss.h
+++ b/librpc/gen_ndr/cli_spoolss.h
@@ -488,10 +488,10 @@ NTSTATUS rpccli_spoolss_EnumPrinterDataEx(struct 
rpc_pipe_client *cli,
  TALLOC_CTX *mem_ctx,
  struct policy_handle *handle /* [in] 
[ref] */,
  const char *key_name /* [in] 
[charset(UTF16)] */,
- uint8_t *buffer /* [out] 
[ref,size_is(offered)] */,
  uint32_t offered /* [in]  */,
- uint32_t *needed /* [out] [ref] */,
  uint32_t *count /* [out] [ref] */,
+ struct spoolss_PrinterEnumValues 
**info /* [out] [ref,size_is(,*count)] */,
+ uint32_t *needed /* [out] [ref] */,
  WERROR *werror);
 NTSTATUS rpccli_spoolss_EnumPrinterKey(struct rpc_pipe_client *cli,
   TALLOC_CTX *mem_ctx,
diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c
index f9781bc..d340b81 100644
--- a/librpc/gen_ndr/ndr_spoolss.c
+++ b/librpc/gen_ndr/ndr_spoolss.c
@@ -26296,7 +26296,7 @@ _PUBLIC_ void ndr_print_spoolss_GetPrinterDataEx(struct 
ndr_print *ndr, const ch
ndr-depth--;
 }
 
-_PUBLIC_ enum ndr_err_code 

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-514-g9d024d1

[Günther Deschner]

The branch, master has been updated
   via  9d024d17153ad10b0df0531480b2a0a43f910dba (commit)
   via  f9712d568ab6331be5a62a34ce60331013ccd253 (commit)
   via  8c3ef2d9004f3c540bae21b92e0b568008bc1130 (commit)
   via  ab85fc78bd932aca14103352f784a4b5f2909f3a (commit)
  from  18a93e3e62f29448f34f9af84aba54eedb26fe21 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 9d024d17153ad10b0df0531480b2a0a43f910dba
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 18 00:38:01 2009 +0100

s3-spoolss: remove old rpccli_spoolss_enumprinterdataex.

Guenther

commit f9712d568ab6331be5a62a34ce60331013ccd253
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 18 01:06:22 2009 +0100

s3-net: use rpccli_spoolss_enumprinterdataex.

Guenther

commit 8c3ef2d9004f3c540bae21b92e0b568008bc1130
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 23:45:16 2009 +0100

s3-rpcclient: use rpccli_spoolss_enumprinterdataex wrapper.

Guenther

commit ab85fc78bd932aca14103352f784a4b5f2909f3a
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 23:39:00 2009 +0100

s3-spoolss: add rpccli_spoolss_enumprinterdataex convenience wrapper.

Guenther

---

Summary of changes:
 source3/include/proto.h  |   13 +++---
 source3/rpc_client/cli_spoolss.c |   85 ++
 source3/rpcclient/cmd_spoolss.c  |   36 
 source3/utils/net_rpc_printer.c  |   68 +++---
 4 files changed, 101 insertions(+), 101 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index d3db1e8..1c2abc6 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5543,9 +5543,13 @@ WERROR rpccli_spoolss_enumprinterkey(struct 
rpc_pipe_client *cli,
 const char *key_name,
 const char ***key_buffer,
 uint32_t offered);
-WERROR rpccli_spoolss_enumprinterdataex(struct rpc_pipe_client *cli, 
TALLOC_CTX *mem_ctx,
-POLICY_HND *hnd, const char *keyname, 
-REGVAL_CTR *ctr);
+WERROR rpccli_spoolss_enumprinterdataex(struct rpc_pipe_client *cli,
+   TALLOC_CTX *mem_ctx,
+   struct policy_handle *handle,
+   const char *key_name,
+   uint32_t offered,
+   uint32_t *count,
+   struct spoolss_PrinterEnumValues 
**info);
 
 /* The following definitions come from rpc_client/init_spoolss.c  */
 
@@ -5827,9 +5831,6 @@ bool sec_io_desc_buf(const char *desc, SEC_DESC_BUF 
**ppsdb, prs_struct *ps, int
 
 uint32 spoolss_size_printer_enum_values(PRINTER_ENUM_VALUES *p);
 bool make_spoolss_buffer5(TALLOC_CTX *mem_ctx, BUFFER5 *buf5, uint32 len, 
uint16 *src);
-bool make_spoolss_q_enumprinterdataex(SPOOL_Q_ENUMPRINTERDATAEX *q_u,
- const POLICY_HND *hnd, const char *key,
- uint32 size);
 bool spoolss_io_q_enumprinterdataex(const char *desc, 
SPOOL_Q_ENUMPRINTERDATAEX *q_u, prs_struct *ps, int depth);
 bool spoolss_io_r_enumprinterdataex(const char *desc, 
SPOOL_R_ENUMPRINTERDATAEX *r_u, prs_struct *ps, int depth);
 
diff --git a/source3/rpc_client/cli_spoolss.c b/source3/rpc_client/cli_spoolss.c
index 9ca3ab6..3f369bd 100644
--- a/source3/rpc_client/cli_spoolss.c
+++ b/source3/rpc_client/cli_spoolss.c
@@ -784,66 +784,43 @@ WERROR rpccli_spoolss_enumprinterkey(struct 
rpc_pipe_client *cli,
return werror;
 }
 
-
-/*
- Decode various spoolss rpc's and info levels
- /
-
 /**
+ convencience wrapper around rpccli_spoolss_EnumPrinterDataEx
 **/
 
-WERROR rpccli_spoolss_enumprinterdataex(struct rpc_pipe_client *cli, 
TALLOC_CTX *mem_ctx,
-POLICY_HND *hnd, const char *keyname, 
-REGVAL_CTR *ctr)
+WERROR rpccli_spoolss_enumprinterdataex(struct rpc_pipe_client *cli,
+   TALLOC_CTX *mem_ctx,
+   struct policy_handle *handle,
+   const char *key_name,
+   uint32_t offered,
+   uint32_t *count,
+   struct 

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-468-g6f87c10

[Günther Deschner]

The branch, v3-4-test has been updated
   via  6f87c105748689bf1e902b83603e57c12f7edce3 (commit)
   via  c7660dacbcf5d6132960508104507ed1e2fca878 (commit)
   via  83b10f0405f596bf5ffb8eb7071fb85d1df62428 (commit)
   via  2ecc69851773d3a2cfa0e0e2dc1e90eff26e3fb0 (commit)
  from  8150299e89339e6bcc2e4d1d30146a91f7bc1b1c (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -
commit 6f87c105748689bf1e902b83603e57c12f7edce3
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 18 00:38:01 2009 +0100

s3-spoolss: remove old rpccli_spoolss_enumprinterdataex.

Guenther
(cherry picked from commit 9d024d17153ad10b0df0531480b2a0a43f910dba)

commit c7660dacbcf5d6132960508104507ed1e2fca878
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 18 01:06:22 2009 +0100

s3-net: use rpccli_spoolss_enumprinterdataex.

Guenther
(cherry picked from commit f9712d568ab6331be5a62a34ce60331013ccd253)

commit 83b10f0405f596bf5ffb8eb7071fb85d1df62428
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 23:45:16 2009 +0100

s3-rpcclient: use rpccli_spoolss_enumprinterdataex wrapper.

Guenther
(cherry picked from commit 8c3ef2d9004f3c540bae21b92e0b568008bc1130)

commit 2ecc69851773d3a2cfa0e0e2dc1e90eff26e3fb0
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 17 23:39:00 2009 +0100

s3-spoolss: add rpccli_spoolss_enumprinterdataex convenience wrapper.

Guenther
(cherry picked from commit ab85fc78bd932aca14103352f784a4b5f2909f3a)

---

Summary of changes:
 source3/include/proto.h  |   13 +++---
 source3/rpc_client/cli_spoolss.c |   85 ++
 source3/rpcclient/cmd_spoolss.c  |   36 
 source3/utils/net_rpc_printer.c  |   68 +++---
 4 files changed, 101 insertions(+), 101 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index d3db1e8..1c2abc6 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5543,9 +5543,13 @@ WERROR rpccli_spoolss_enumprinterkey(struct 
rpc_pipe_client *cli,
 const char *key_name,
 const char ***key_buffer,
 uint32_t offered);
-WERROR rpccli_spoolss_enumprinterdataex(struct rpc_pipe_client *cli, 
TALLOC_CTX *mem_ctx,
-POLICY_HND *hnd, const char *keyname, 
-REGVAL_CTR *ctr);
+WERROR rpccli_spoolss_enumprinterdataex(struct rpc_pipe_client *cli,
+   TALLOC_CTX *mem_ctx,
+   struct policy_handle *handle,
+   const char *key_name,
+   uint32_t offered,
+   uint32_t *count,
+   struct spoolss_PrinterEnumValues 
**info);
 
 /* The following definitions come from rpc_client/init_spoolss.c  */
 
@@ -5827,9 +5831,6 @@ bool sec_io_desc_buf(const char *desc, SEC_DESC_BUF 
**ppsdb, prs_struct *ps, int
 
 uint32 spoolss_size_printer_enum_values(PRINTER_ENUM_VALUES *p);
 bool make_spoolss_buffer5(TALLOC_CTX *mem_ctx, BUFFER5 *buf5, uint32 len, 
uint16 *src);
-bool make_spoolss_q_enumprinterdataex(SPOOL_Q_ENUMPRINTERDATAEX *q_u,
- const POLICY_HND *hnd, const char *key,
- uint32 size);
 bool spoolss_io_q_enumprinterdataex(const char *desc, 
SPOOL_Q_ENUMPRINTERDATAEX *q_u, prs_struct *ps, int depth);
 bool spoolss_io_r_enumprinterdataex(const char *desc, 
SPOOL_R_ENUMPRINTERDATAEX *r_u, prs_struct *ps, int depth);
 
diff --git a/source3/rpc_client/cli_spoolss.c b/source3/rpc_client/cli_spoolss.c
index 9ca3ab6..3f369bd 100644
--- a/source3/rpc_client/cli_spoolss.c
+++ b/source3/rpc_client/cli_spoolss.c
@@ -784,66 +784,43 @@ WERROR rpccli_spoolss_enumprinterkey(struct 
rpc_pipe_client *cli,
return werror;
 }
 
-
-/*
- Decode various spoolss rpc's and info levels
- /
-
 /**
+ convencience wrapper around rpccli_spoolss_EnumPrinterDataEx
 **/
 
-WERROR rpccli_spoolss_enumprinterdataex(struct rpc_pipe_client *cli, 
TALLOC_CTX *mem_ctx,
-POLICY_HND *hnd, const char *keyname, 
-REGVAL_CTR *ctr)
+WERROR rpccli_spoolss_enumprinterdataex(struct rpc_pipe_client *cli,
+   TALLOC_CTX 

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-515-g6e52c23

[Günther Deschner]

The branch, master has been updated
   via  6e52c232c7c761a7b7d0ea4ec94214f580a481a7 (commit)
  from  9d024d17153ad10b0df0531480b2a0a43f910dba (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 6e52c232c7c761a7b7d0ea4ec94214f580a481a7
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 18 01:39:49 2009 +0100

s4-smbtorture: fix spoolss_EnumPrinterDataEx tests.

sorry, I could swear this did compile...

Guenther

---

Summary of changes:
 source4/torture/rpc/spoolss.c |3 ++-
 source4/torture/rpc/spoolss_win.c |4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index c16def0..2bdcc3f 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -1463,6 +1463,7 @@ static bool test_EnumPrinterDataEx(struct torture_context 
*tctx,
 {
NTSTATUS status;
struct spoolss_EnumPrinterDataEx r;
+   struct spoolss_PrinterEnumValues *info;
uint32_t needed;
uint32_t count;
 
@@ -1471,6 +1472,7 @@ static bool test_EnumPrinterDataEx(struct torture_context 
*tctx,
r.in.offered = 0;
r.out.needed = needed;
r.out.count = count;
+   r.out.info = info;
 
torture_comment(tctx, Testing EnumPrinterDataEx\n);
 
@@ -1478,7 +1480,6 @@ static bool test_EnumPrinterDataEx(struct torture_context 
*tctx,
torture_assert_ntstatus_ok(tctx, status, EnumPrinterDataEx failed);
 
r.in.offered = needed;
-   r.out.buffer = talloc_array(tctx, uint8_t, needed);
 
status = dcerpc_spoolss_EnumPrinterDataEx(p, tctx, r);
 
diff --git a/source4/torture/rpc/spoolss_win.c 
b/source4/torture/rpc/spoolss_win.c
index 71c1ce9..5624e68 100644
--- a/source4/torture/rpc/spoolss_win.c
+++ b/source4/torture/rpc/spoolss_win.c
@@ -405,6 +405,7 @@ static bool test_EnumPrinterDataEx(struct torture_context 
*tctx,
 {
NTSTATUS status;
struct spoolss_EnumPrinterDataEx epde;
+   struct spoolss_PrinterEnumValues *info;
uint32_t needed;
uint32_t count;
 
@@ -415,13 +416,12 @@ static bool test_EnumPrinterDataEx(struct torture_context 
*tctx,
epde.in.offered = 0;
epde.out.needed = needed;
epde.out.count = count;
-   epde.out.buffer = talloc_array(tctx, uint8_t, 0);
+   epde.out.info = info;
 
status = dcerpc_spoolss_EnumPrinterDataEx(p, tctx, epde);
torture_assert_ntstatus_ok(tctx, status, EnumPrinterDataEx failed.);
if (W_ERROR_EQUAL(epde.out.result, WERR_MORE_DATA)) {
epde.in.offered = needed;
-   epde.out.buffer = talloc_array(tctx, uint8_t, needed);
status = dcerpc_spoolss_EnumPrinterDataEx(p, tctx, epde);
torture_assert_ntstatus_ok(tctx, status,
EnumPrinterDataEx failed.);


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-469-g5136420

[Günther Deschner]

The branch, v3-4-test has been updated
   via  513642018acf1c3690bc35e1d0c6f52177ef511c (commit)
  from  6f87c105748689bf1e902b83603e57c12f7edce3 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -
commit 513642018acf1c3690bc35e1d0c6f52177ef511c
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 18 01:39:49 2009 +0100

s4-smbtorture: fix spoolss_EnumPrinterDataEx tests.

sorry, I could swear this did compile...

Guenther
(cherry picked from commit 6e52c232c7c761a7b7d0ea4ec94214f580a481a7)

---

Summary of changes:
 source4/torture/rpc/spoolss.c |3 ++-
 source4/torture/rpc/spoolss_win.c |4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index c16def0..2bdcc3f 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -1463,6 +1463,7 @@ static bool test_EnumPrinterDataEx(struct torture_context 
*tctx,
 {
NTSTATUS status;
struct spoolss_EnumPrinterDataEx r;
+   struct spoolss_PrinterEnumValues *info;
uint32_t needed;
uint32_t count;
 
@@ -1471,6 +1472,7 @@ static bool test_EnumPrinterDataEx(struct torture_context 
*tctx,
r.in.offered = 0;
r.out.needed = needed;
r.out.count = count;
+   r.out.info = info;
 
torture_comment(tctx, Testing EnumPrinterDataEx\n);
 
@@ -1478,7 +1480,6 @@ static bool test_EnumPrinterDataEx(struct torture_context 
*tctx,
torture_assert_ntstatus_ok(tctx, status, EnumPrinterDataEx failed);
 
r.in.offered = needed;
-   r.out.buffer = talloc_array(tctx, uint8_t, needed);
 
status = dcerpc_spoolss_EnumPrinterDataEx(p, tctx, r);
 
diff --git a/source4/torture/rpc/spoolss_win.c 
b/source4/torture/rpc/spoolss_win.c
index 71c1ce9..5624e68 100644
--- a/source4/torture/rpc/spoolss_win.c
+++ b/source4/torture/rpc/spoolss_win.c
@@ -405,6 +405,7 @@ static bool test_EnumPrinterDataEx(struct torture_context 
*tctx,
 {
NTSTATUS status;
struct spoolss_EnumPrinterDataEx epde;
+   struct spoolss_PrinterEnumValues *info;
uint32_t needed;
uint32_t count;
 
@@ -415,13 +416,12 @@ static bool test_EnumPrinterDataEx(struct torture_context 
*tctx,
epde.in.offered = 0;
epde.out.needed = needed;
epde.out.count = count;
-   epde.out.buffer = talloc_array(tctx, uint8_t, 0);
+   epde.out.info = info;
 
status = dcerpc_spoolss_EnumPrinterDataEx(p, tctx, epde);
torture_assert_ntstatus_ok(tctx, status, EnumPrinterDataEx failed.);
if (W_ERROR_EQUAL(epde.out.result, WERR_MORE_DATA)) {
epde.in.offered = needed;
-   epde.out.buffer = talloc_array(tctx, uint8_t, needed);
status = dcerpc_spoolss_EnumPrinterDataEx(p, tctx, epde);
torture_assert_ntstatus_ok(tctx, status,
EnumPrinterDataEx failed.);


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-516-gcd7f62a

[Günther Deschner]

The branch, master has been updated
   via  cd7f62ab70337ccee7ba652e7d9ed8d299938bff (commit)
  from  6e52c232c7c761a7b7d0ea4ec94214f580a481a7 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit cd7f62ab70337ccee7ba652e7d9ed8d299938bff
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 18 02:33:18 2009 +0100

s3-spoolss: use rpccli_spoolss_enumprinterdataex in ldap_printer.c.

Guenther

---

Summary of changes:
 source3/libads/ldap_printer.c |   69 +---
 1 files changed, 43 insertions(+), 26 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libads/ldap_printer.c b/source3/libads/ldap_printer.c
index a61df3c..e3e8e91 100644
--- a/source3/libads/ldap_printer.c
+++ b/source3/libads/ldap_printer.c
@@ -311,7 +311,8 @@ WERROR get_remote_printer_publishing_data(struct 
rpc_pipe_client *cli,
 {
WERROR result;
char *printername;
-   REGVAL_CTR *dsdriver_ctr, *dsspooler_ctr;
+   struct spoolss_PrinterEnumValues *info;
+   uint32_t count;
uint32 i;
POLICY_HND pol;
 
@@ -330,48 +331,64 @@ WERROR get_remote_printer_publishing_data(struct 
rpc_pipe_client *cli,
SAFE_FREE(printername);
return result;
}
-   
-   if ( !(dsdriver_ctr = TALLOC_ZERO_P( mem_ctx, REGVAL_CTR )) )  {
-   SAFE_FREE(printername);
-   return WERR_NOMEM;
-   }
 
-   result = rpccli_spoolss_enumprinterdataex(cli, mem_ctx, pol, 
SPOOL_DSDRIVER_KEY, dsdriver_ctr);
+   result = rpccli_spoolss_enumprinterdataex(cli, mem_ctx, pol,
+ SPOOL_DSDRIVER_KEY,
+ 0,
+ count,
+ info);
 
if (!W_ERROR_IS_OK(result)) {
DEBUG(3, (Unable to do enumdataex on %s, error is %s.\n,
  printername, win_errstr(result)));
} else {
-   uint32 num_values = regval_ctr_numvals( dsdriver_ctr );
-
/* Have the data we need now, so start building */
-   for (i=0; i  num_values; i++) {
-   map_regval_to_ads(mem_ctx, mods, 
dsdriver_ctr-values[i]);
+   for (i=0; i  count; i++) {
+   REGISTRY_VALUE v;
+   DATA_BLOB blob;
+
+   result = push_spoolss_PrinterData(mem_ctx, blob,
+ info[i].type,
+ info[i].data);
+   if (W_ERROR_IS_OK(result)) {
+   fstrcpy(v.valuename, info[i].value_name);
+   v.type = info[i].type;
+   v.data_p = blob.data;
+   v.size = blob.length;
+
+   map_regval_to_ads(mem_ctx, mods, v);
+   }
}
}
-   
-   if ( !(dsspooler_ctr = TALLOC_ZERO_P( mem_ctx, REGVAL_CTR )) ) {
-   SAFE_FREE(printername);
-   return WERR_NOMEM;
-   }
-
-   result = rpccli_spoolss_enumprinterdataex(cli, mem_ctx, pol, 
SPOOL_DSSPOOLER_KEY, dsspooler_ctr);
 
+   result = rpccli_spoolss_enumprinterdataex(cli, mem_ctx, pol,
+ SPOOL_DSSPOOLER_KEY,
+ 0,
+ count,
+ info);
if (!W_ERROR_IS_OK(result)) {
DEBUG(3, (Unable to do enumdataex on %s, error is %s.\n,
  printername, win_errstr(result)));
} else {
-   uint32 num_values = regval_ctr_numvals( dsspooler_ctr );
-
-   for (i=0; inum_values; i++) {
-   map_regval_to_ads(mem_ctx, mods, 
dsspooler_ctr-values[i]);
+   for (i=0; i  count; i++) {
+   REGISTRY_VALUE v;
+   DATA_BLOB blob;
+
+   result = push_spoolss_PrinterData(mem_ctx, blob,
+ info[i].type,
+ info[i].data);
+   if (W_ERROR_IS_OK(result)) {
+   fstrcpy(v.valuename, info[i].value_name);
+   v.type = info[i].type;
+   v.data_p = blob.data;
+   v.size = blob.length;
+
+   map_regval_to_ads(mem_ctx, mods, v);
+   }
}
}
-   
-   

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-470-g38a2256

[Günther Deschner]

The branch, v3-4-test has been updated
   via  38a225667ee7e59d4fcf090255a077c0660130ea (commit)
  from  513642018acf1c3690bc35e1d0c6f52177ef511c (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -
commit 38a225667ee7e59d4fcf090255a077c0660130ea
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 18 02:33:18 2009 +0100

s3-spoolss: use rpccli_spoolss_enumprinterdataex in ldap_printer.c.

Guenther
(cherry picked from commit cd7f62ab70337ccee7ba652e7d9ed8d299938bff)

---

Summary of changes:
 source3/libads/ldap_printer.c |   69 +---
 1 files changed, 43 insertions(+), 26 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libads/ldap_printer.c b/source3/libads/ldap_printer.c
index a61df3c..e3e8e91 100644
--- a/source3/libads/ldap_printer.c
+++ b/source3/libads/ldap_printer.c
@@ -311,7 +311,8 @@ WERROR get_remote_printer_publishing_data(struct 
rpc_pipe_client *cli,
 {
WERROR result;
char *printername;
-   REGVAL_CTR *dsdriver_ctr, *dsspooler_ctr;
+   struct spoolss_PrinterEnumValues *info;
+   uint32_t count;
uint32 i;
POLICY_HND pol;
 
@@ -330,48 +331,64 @@ WERROR get_remote_printer_publishing_data(struct 
rpc_pipe_client *cli,
SAFE_FREE(printername);
return result;
}
-   
-   if ( !(dsdriver_ctr = TALLOC_ZERO_P( mem_ctx, REGVAL_CTR )) )  {
-   SAFE_FREE(printername);
-   return WERR_NOMEM;
-   }
 
-   result = rpccli_spoolss_enumprinterdataex(cli, mem_ctx, pol, 
SPOOL_DSDRIVER_KEY, dsdriver_ctr);
+   result = rpccli_spoolss_enumprinterdataex(cli, mem_ctx, pol,
+ SPOOL_DSDRIVER_KEY,
+ 0,
+ count,
+ info);
 
if (!W_ERROR_IS_OK(result)) {
DEBUG(3, (Unable to do enumdataex on %s, error is %s.\n,
  printername, win_errstr(result)));
} else {
-   uint32 num_values = regval_ctr_numvals( dsdriver_ctr );
-
/* Have the data we need now, so start building */
-   for (i=0; i  num_values; i++) {
-   map_regval_to_ads(mem_ctx, mods, 
dsdriver_ctr-values[i]);
+   for (i=0; i  count; i++) {
+   REGISTRY_VALUE v;
+   DATA_BLOB blob;
+
+   result = push_spoolss_PrinterData(mem_ctx, blob,
+ info[i].type,
+ info[i].data);
+   if (W_ERROR_IS_OK(result)) {
+   fstrcpy(v.valuename, info[i].value_name);
+   v.type = info[i].type;
+   v.data_p = blob.data;
+   v.size = blob.length;
+
+   map_regval_to_ads(mem_ctx, mods, v);
+   }
}
}
-   
-   if ( !(dsspooler_ctr = TALLOC_ZERO_P( mem_ctx, REGVAL_CTR )) ) {
-   SAFE_FREE(printername);
-   return WERR_NOMEM;
-   }
-
-   result = rpccli_spoolss_enumprinterdataex(cli, mem_ctx, pol, 
SPOOL_DSSPOOLER_KEY, dsspooler_ctr);
 
+   result = rpccli_spoolss_enumprinterdataex(cli, mem_ctx, pol,
+ SPOOL_DSSPOOLER_KEY,
+ 0,
+ count,
+ info);
if (!W_ERROR_IS_OK(result)) {
DEBUG(3, (Unable to do enumdataex on %s, error is %s.\n,
  printername, win_errstr(result)));
} else {
-   uint32 num_values = regval_ctr_numvals( dsspooler_ctr );
-
-   for (i=0; inum_values; i++) {
-   map_regval_to_ads(mem_ctx, mods, 
dsspooler_ctr-values[i]);
+   for (i=0; i  count; i++) {
+   REGISTRY_VALUE v;
+   DATA_BLOB blob;
+
+   result = push_spoolss_PrinterData(mem_ctx, blob,
+ info[i].type,
+ info[i].data);
+   if (W_ERROR_IS_OK(result)) {
+   fstrcpy(v.valuename, info[i].value_name);
+   v.type = info[i].type;
+   v.data_p = blob.data;
+   v.size = blob.length;
+
+   map_regval_to_ads(mem_ctx, mods,