[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
   via  4cced4d s3:client: The smbspool krb5 wrapper needs negotiate for 
authentication
   via  5fe76a5 s3: smbd: Fix a read after free if a chained SMB1 call goes 
async.
   via  7f4e7cf s3/notifyd: ensure notifyd doesn't return from 
smbd_notifyd_init
  from  85b10a6 s3: drop build_env

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


- Log -
commit 4cced4da4ca97f0c6db227e6b2c7e03c2e5c1f28
Author: Andreas Schneider 
Date:   Fri Jul 7 14:08:49 2017 +0200

s3:client: The smbspool krb5 wrapper needs negotiate for authentication

If you create a new printer it doesn't have AuthInfoRequired set and so
cups calls the backend with:

  AUTH_INFO_REQUIRED=none

In this case we need to return:

  ATTR: auth-info-required=negotiate

and return an error that we require authentication.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12886

Signed-off-by: Andreas Schneider 
Reviewed-by: Jeremy Allison 

Autobuild-User(master): Jeremy Allison 
Autobuild-Date(master): Sat Jul 15 06:43:47 CEST 2017 on sn-devel-144

commit 5fe76a5474823ed7602938a07c9c43226a7882a3
Author: Jeremy Allison 
Date:   Thu Jul 13 12:06:58 2017 -0700

s3: smbd: Fix a read after free if a chained SMB1 call goes async.

Reported to the Samba Team by Yihan Lian , a security
researcher of Qihoo 360 GearTeam. Thanks a lot!

smb1_parse_chain() incorrectly used talloc_tos() for the memory
context of the chained smb1 requests. This gets freed between
requests so if a chained request goes async, the saved request
array also is freed, which causes a crash on resume.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12836

Signed-off-by: Jeremy Allison 
Reviewed-by: Stefan Metzmacher 

commit 7f4e7cfd1b0bd917395c631a1a8195fffd13bbad
Author: Ralph Boehme 
Date:   Fri Jul 14 16:38:36 2017 +0200

s3/notifyd: ensure notifyd doesn't return from smbd_notifyd_init

Bug: https://bugzilla.samba.org/show_bug.cgi?id=12910

Signed-off-by: Ralph Boehme 
Reviewed-by: Jeremy Allison 

---

Summary of changes:
 source3/client/smbspool_krb5_wrapper.c | 29 +++--
 source3/smbd/process.c |  2 +-
 source3/smbd/server.c  |  8 +++-
 3 files changed, 27 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/client/smbspool_krb5_wrapper.c 
b/source3/client/smbspool_krb5_wrapper.c
index bf97d82..a72006a 100644
--- a/source3/client/smbspool_krb5_wrapper.c
+++ b/source3/client/smbspool_krb5_wrapper.c
@@ -95,17 +95,26 @@ int main(int argc, char *argv[])
 
 /* If not set, then just call smbspool. */
if (env == NULL) {
-   CUPS_SMB_ERROR("AUTH_INFO_REQUIRED is not set");
-goto smbspool;
+   CUPS_SMB_DEBUG("AUTH_INFO_REQUIRED is not set - "
+  "execute smbspool");
+   goto smbspool;
} else {
-CUPS_SMB_DEBUG("AUTH_INFO_REQUIRED=%s", env);
-cmp = strcmp(env, "negotiate");
-/* If AUTH_INFO_REQUIRED != "negotiate" then call smbspool. */
-if (cmp != 0) {
-  CUPS_SMB_ERROR(
-"AUTH_INFO_REQUIRED is not set to negotiate");
-  goto smbspool;
-}
+   CUPS_SMB_DEBUG("AUTH_INFO_REQUIRED=%s", env);
+
+   cmp = strcmp(env, "username,password");
+   if (cmp == 0) {
+   CUPS_SMB_DEBUG("Authenticate using username/password - "
+  "execute smbspool");
+   goto smbspool;
+   }
+
+   /* if AUTH_INFO_REQUIRED=none */
+   cmp = strcmp(env, "negotiate");
+   if (cmp != 0) {
+   CUPS_SMB_ERROR("Authentication unsupported");
+   fprintf(stderr, "ATTR: auth-info-required=negotiate\n");
+   return CUPS_BACKEND_AUTH_REQUIRED;
+   }
}
 
uid = getuid();
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index a19b8b7..3765739 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1785,7 +1785,7 @@ static void construct_reply_chain(struct 
smbXsrv_connection *xconn,
unsigned num_reqs;
bool ok;
 
-   ok = smb1_parse_chain(talloc_tos(), (uint8_t *)inbuf, xconn, encrypted,
+   ok = smb1_parse_chain(xconn, (uint8_t *)inbuf, xconn, encrypted,

autobuild[sn-devel-144]: intermittent test failure detected

[autobuild]

The autobuild test system (on sn-devel-144) has detected an intermittent 
failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey.sn-devel-144/2017-07-15-0255/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-144/2017-07-15-0255/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-144/2017-07-15-0255/samba.stdout
  
The top commit at the time of the failure was:

commit 85b10a636e0eeeca0948c6b1d59d2df7b4507d45
Author: Bernhard M. Wiedemann 
Date:   Mon Jul 10 18:29:41 2017 +0200

s3: drop build_env

As a follow up to eedebe2ef1b ("docs-xml: Sort input file list"), this
change enables reproducible builds, without the added complexity of
https://lists.samba.org/archive/samba-technical/2017-June/121302.html

Bug: https://bugzilla.samba.org/show_bug.cgi?id=12906

Signed-off-by: Bernhard M. Wiedemann 
Reviewed-by: David Disseldorp 
Reviewed-by: Andrew Bartlett 

Autobuild-User(master): David Disseldorp 
Autobuild-Date(master): Fri Jul 14 18:48:08 CEST 2017 on sn-devel-144

[SCM] Samba Shared Repository - branch master updated

[David Disseldorp]

The branch, master has been updated
   via  85b10a6 s3: drop build_env
  from  0ed918e Build py3 versions of other rpc modules

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


- Log -
commit 85b10a636e0eeeca0948c6b1d59d2df7b4507d45
Author: Bernhard M. Wiedemann 
Date:   Mon Jul 10 18:29:41 2017 +0200

s3: drop build_env

As a follow up to eedebe2ef1b ("docs-xml: Sort input file list"), this
change enables reproducible builds, without the added complexity of
https://lists.samba.org/archive/samba-technical/2017-June/121302.html

Bug: https://bugzilla.samba.org/show_bug.cgi?id=12906

Signed-off-by: Bernhard M. Wiedemann 
Reviewed-by: David Disseldorp 
Reviewed-by: Andrew Bartlett 

Autobuild-User(master): David Disseldorp 
Autobuild-Date(master): Fri Jul 14 18:48:08 CEST 2017 on sn-devel-144

---

Summary of changes:
 buildtools/wafsamba/samba_patterns.py | 14 
 source3/script/build_env.sh   | 41 ---
 source3/wscript_build |  8 ---
 3 files changed, 63 deletions(-)
 delete mode 100755 source3/script/build_env.sh


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_patterns.py 
b/buildtools/wafsamba/samba_patterns.py
index 1baa601..e809f26 100644
--- a/buildtools/wafsamba/samba_patterns.py
+++ b/buildtools/wafsamba/samba_patterns.py
@@ -51,7 +51,6 @@ def write_build_options_header(fp):
 fp.write("*/\n")
 fp.write("\n")
 fp.write("#include \"includes.h\"\n")
-fp.write("#include \"build_env.h\"\n")
 fp.write("#include \"dynconfig/dynconfig.h\"\n")
 fp.write("#include \"lib/cluster_support.h\"\n")
 
@@ -92,19 +91,6 @@ def write_build_options_header(fp):
 fp.write("  return;\n")
 fp.write("   }\n")
 fp.write("\n")
-fp.write("#ifdef _BUILD_ENV_H\n")
-fp.write("   /* Output information about the build environment */\n")
-fp.write("   output(screen,\"Build environment:\\n\");\n")
-fp.write("   output(screen,\"   Built by:
%s@%s\\n\",BUILD_ENV_USER,BUILD_ENV_HOST);\n")
-fp.write("   output(screen,\"   Built on:
%s\\n\",BUILD_ENV_DATE);\n")
-fp.write("\n")
-fp.write("   output(screen,\"   Built using: 
%s\\n\",BUILD_ENV_COMPILER);\n")
-fp.write("   output(screen,\"   Build host:  
%s\\n\",BUILD_ENV_UNAME);\n")
-fp.write("   output(screen,\"   SRCDIR:  
%s\\n\",BUILD_ENV_SRCDIR);\n")
-fp.write("   output(screen,\"   BUILDDIR:
%s\\n\",BUILD_ENV_BUILDDIR);\n")
-fp.write("\n")
-fp.write("\n")
-fp.write("#endif\n")
 fp.write("\n")
 fp.write("   /* Output various paths to files and directories */\n")
 fp.write("   output(screen,\"\\nPaths:\\n\");\n")
diff --git a/source3/script/build_env.sh b/source3/script/build_env.sh
deleted file mode 100755
index eb54f37..000
--- a/source3/script/build_env.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-if [ $# -lt 3 ]
-then
-echo "Usage: $0 srcdir builddir compiler"
-exit 1
-fi
-
-uname=`uname -a`
-date=`date`
-srcdir=$1
-builddir=$2
-compiler=$3
-
-if [ ! "x$USER" = "x" ]; then
-whoami=$USER
-else 
-if [ ! "x$LOGNAME" = "x" ]; then
-   whoami=$LOGNAME
-else
-   whoami=`whoami || id -un`
-fi
-fi
-
-host=`hostname`
-
-cat <

autobuild[sn-devel-144]: intermittent test failure detected

[autobuild]

The autobuild test system (on sn-devel-144) has detected an intermittent 
failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey.sn-devel-144/2017-07-14-1625/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-144/2017-07-14-1625/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-144/2017-07-14-1625/samba.stdout
  
The top commit at the time of the failure was:

commit 0ed918ef5276c459d46c9e77c9e9d84bc41d4b14
Author: Alexander Bokovoy 
Date:   Thu Jul 13 14:49:12 2017 +0300

Build py3 versions of other rpc modules

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12905

Signed-off-by: Alexander Bokovoy 
Reviewed-by: Andrew Bartlett 

Autobuild-User(master): Alexander Bokovoy 
Autobuild-Date(master): Fri Jul 14 11:36:53 CEST 2017 on sn-devel-144

[SCM] UID Wrapper Repository - annotated tag uid_wrapper-1.2.3 created

[Andreas Schneider]

The annotated tag, uid_wrapper-1.2.3 has been created
at  0635fb5049b315501015566064f814b9e980784b (tag)
   tagging  7386dc6dfa2e4b78e1616acbdff88efc8e089dd7 (commit)
  replaces  uid_wrapper-1.2.2
 tagged by  Andreas Schneider
on  Fri Jul 14 15:22:37 2017 +0200

- Log -
uid_wrapper-1.2.3
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEjf9T4Y8qvI2PPJIjfuD8TcwBTj0FAlloxZ8ACgkQfuD8TcwB
Tj0csg/6AuemV18jNxi+r6GVPlnvwSduJXd03WlCVzONxOsnQKExPgnjAdphAFKq
22uZDQ5B/MMOtvqVEeGpiQnmJTQKYd2olyzo5xKCv9ha342NcHILzVQvs5AWBn2j
hZwCVZz6KYQX9+cUKzgAcjEW8PejmeDBIXYJnC4JC4wqV9qxAXVpy/qjlnWKYUy7
nWuxhSjXMJjEOVLo4467ejvfyoTKQh+5pd8A6vXBXCFO7jWdwidH8syuS+BOku0V
KKmPksoz7BGdj9nWv6NFFkViIbBTcDcEPpAO+TF8Z7OyphxmjQMJ7mM/MrADRI8k
laj0PPBcoXTiMdKmJxuMDZkOI1nPLkRjy9OtEkmz7USN+fW0fYmJjQ0LrJ33kmmv
IbIbsac+DgU61+sxJkNNIVX2Wz/glvmJkL0V+eoXhUvPa2pIEcSob3No805Qby0o
fEDI+2MzajhgpsZYFTtWUh4f8458n+xAEfGDJDS5AwbgI6o6P0umgQI32VAnHRyk
tisTZMbH5ozgB3ZQOFOjVJ/OBHR/CNf2xa5ISj11/1ZSMGILAreQHvmbSt1Iq6oY
NzLcYdviYzSvNMbqKmjItXc0qZ1gKYoTpKrYJNZdrxUtSUAyNHkBbMHRQPsdNQ2u
+cqSY3P41UrswB7mtKVqxHOxztAC2ddXx8JC65mSSIppJ37MP0g=
=gOqA
-END PGP SIGNATURE-

Andreas Schneider (6):
  uwrap: Do not leak groups_str
  uwrap: Add mamximum for groups we can handle while forking
  uwrap: Add log message before exit
  uwrap: Always enable logging
  uwrap: Do an early return if log level doesn't match
  Bump version to 1.2.3

---


-- 
UID Wrapper Repository

[SCM] UID Wrapper Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
   via  7386dc6 Bump version to 1.2.3
   via  4cbcf1f uwrap: Do an early return if log level doesn't match
   via  c59500e uwrap: Always enable logging
   via  a337fc9 uwrap: Add log message before exit
   via  3a43ef7 uwrap: Add mamximum for groups we can handle while forking
   via  c71fb12 uwrap: Do not leak groups_str
  from  27e9f76 Bump version to 1.2.2

https://git.samba.org/?p=uid_wrapper.git;a=shortlog;h=master


- Log -
commit 7386dc6dfa2e4b78e1616acbdff88efc8e089dd7
Author: Andreas Schneider 
Date:   Fri Jul 14 10:39:53 2017 +0200

Bump version to 1.2.3

Signed-off-by: Andreas Schneider 
Blessed-by: Stefan Metzmacher 

commit 4cbcf1fd1746bbc2e933401628a2cb71c0f1c45d
Author: Andreas Schneider 
Date:   Fri Jul 14 10:34:48 2017 +0200

uwrap: Do an early return if log level doesn't match

Signed-off-by: Andreas Schneider 
Reviewed-by: Stefan Metzmacher 

commit c59500ee54aa95ebbc43c43ada06eeab41267cd7
Author: Andreas Schneider 
Date:   Fri Jul 14 10:33:46 2017 +0200

uwrap: Always enable logging

Signed-off-by: Andreas Schneider 
Reviewed-by: Stefan Metzmacher 

commit a337fc93269d50a265df1f568a99db490865702f
Author: Andreas Schneider 
Date:   Fri Jul 14 10:31:05 2017 +0200

uwrap: Add log message before exit

Signed-off-by: Andreas Schneider 
Reviewed-by: Stefan Metzmacher 

commit 3a43ef7330fc84e61c8545709e36440affd26950
Author: Andreas Schneider 
Date:   Fri Jul 14 09:05:26 2017 +0200

uwrap: Add mamximum for groups we can handle while forking

Signed-off-by: Andreas Schneider 
Reviewed-by: Stefan Metzmacher 

commit c71fb1219b9d08f7faf27a15977163bb7c86c7a0
Author: Andreas Schneider 
Date:   Fri Jul 14 09:07:19 2017 +0200

uwrap: Do not leak groups_str

Signed-off-by: Andreas Schneider 
Reviewed-by: Stefan Metzmacher 

---

Summary of changes:
 CMakeLists.txt|  2 +-
 ChangeLog |  7 +-
 src/uid_wrapper.c | 71 +--
 3 files changed, 50 insertions(+), 30 deletions(-)


Changeset truncated at 500 lines:

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4dc42f2..97f0e30 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ set(APPLICATION_NAME ${PROJECT_NAME})
 
 set(APPLICATION_VERSION_MAJOR "1")
 set(APPLICATION_VERSION_MINOR "2")
-set(APPLICATION_VERSION_PATCH "2")
+set(APPLICATION_VERSION_PATCH "3")
 
 set(APPLICATION_VERSION 
"${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}.${APPLICATION_VERSION_PATCH}")
 
diff --git a/ChangeLog b/ChangeLog
index cc02554..33a879e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
 ChangeLog
 ==
 
-version 1.2.2 (released 2107-07-13)
+version 1.2.3 (released 2017-07-14)
+  * Logging is always turned on now
+  * Fixed a memory leak
+  * Limited number of groups during fork+exec
+
+version 1.2.2 (released 2017-07-13)
   * Added support for fork'ed and then exec'ed processes
   * Added support for Alpha
 
diff --git a/src/uid_wrapper.c b/src/uid_wrapper.c
index 6e39eb6..0e9be96 100644
--- a/src/uid_wrapper.c
+++ b/src/uid_wrapper.c
@@ -133,9 +133,6 @@ enum uwrap_dbglvl_e {
UWRAP_LOG_TRACE
 };
 
-#ifdef NDEBUG
-# define UWRAP_LOG(...)
-#else /* NDEBUG */
 static void uwrap_log(enum uwrap_dbglvl_e dbglvl, const char *function, const 
char *format, ...) PRINTF_ATTRIBUTE(3, 4);
 # define UWRAP_LOG(dbglvl, ...) uwrap_log((dbglvl), __func__, __VA_ARGS__)
 
@@ -145,42 +142,43 @@ static void uwrap_log(enum uwrap_dbglvl_e dbglvl, const 
char *function, const ch
va_list va;
const char *d;
unsigned int lvl = 0;
+   const char *prefix = "UWRAP";
 
d = getenv("UID_WRAPPER_DEBUGLEVEL");
if (d != NULL) {
lvl = atoi(d);
}
 
+   if (lvl < dbglvl) {
+   return;
+   }
+
va_start(va, format);
vsnprintf(buffer, sizeof(buffer), format, va);
va_end(va);
 
-   if (lvl >= dbglvl) {
-   const char *prefix = "UWRAP";
-   switch (dbglvl) {
-   case UWRAP_LOG_ERROR:
-   prefix = "UWRAP_ERROR";
-   break;
-   case UWRAP_LOG_WARN:
-   prefix = "UWRAP_WARN";
-   break;
-   case UWRAP_LOG_DEBUG:
-   prefix = "UWRAP_DEBUG";
-   break;
-

[SCM] Samba Shared Repository - branch master updated

[Alexander Bokovoy]

The branch, master has been updated
   via  0ed918e Build py3 versions of other rpc modules
   via  303a52d py3: Make sure to specify METH_VARARGS together with 
METH_KEYWORDS
  from  a4c3ee6 s3:smbclient: Allow last dos attribute to be cleared

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


- Log -
commit 0ed918ef5276c459d46c9e77c9e9d84bc41d4b14
Author: Alexander Bokovoy 
Date:   Thu Jul 13 14:49:12 2017 +0300

Build py3 versions of other rpc modules

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12905

Signed-off-by: Alexander Bokovoy 
Reviewed-by: Andrew Bartlett 

Autobuild-User(master): Alexander Bokovoy 
Autobuild-Date(master): Fri Jul 14 11:36:53 CEST 2017 on sn-devel-144

commit 303a52d8d48e4f5754448a876fedc98d7829e2bb
Author: Alexander Bokovoy 
Date:   Thu Jul 13 15:37:47 2017 +0300

py3: Make sure to specify METH_VARARGS together with METH_KEYWORDS

A Python 3 bug https://bugs.python.org/issue15657 explains that one should
always use METH_VARARGS|METH_KEYWORDS when defining a function rather
than a lonely METH_KEYWORDS. We had only one definition like this in
Samba and it was the one that affects FreeIPA when running in Python 3
mode.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12905

Signed-off-by: Alexander Bokovoy 
Reviewed-by: Andrew Bartlett 

---

Summary of changes:
 source4/libnet/py_net.c  |   2 +-
 source4/librpc/wscript_build | 242 +--
 2 files changed, 122 insertions(+), 122 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/libnet/py_net.c b/source4/libnet/py_net.c
index 78e60f6..7ddee2d 100644
--- a/source4/libnet/py_net.c
+++ b/source4/libnet/py_net.c
@@ -745,7 +745,7 @@ static PyMethodDef net_obj_methods[] = {
{"replicate_init", (PyCFunction)py_net_replicate_init, 
METH_VARARGS|METH_KEYWORDS, py_net_replicate_init_doc},
{"replicate_chunk", (PyCFunction)py_net_replicate_chunk, 
METH_VARARGS|METH_KEYWORDS, py_net_replicate_chunk_doc},
{"replicate_decrypt", (PyCFunction)py_net_replicate_decrypt, 
METH_VARARGS|METH_KEYWORDS, py_net_replicate_decrypt_doc},
-   {"finddc", (PyCFunction)py_net_finddc, METH_KEYWORDS, 
py_net_finddc_doc},
+   {"finddc", (PyCFunction)py_net_finddc, METH_VARARGS|METH_KEYWORDS, 
py_net_finddc_doc},
{ NULL }
 };
 
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index a14215b..e341432 100644
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -252,159 +252,159 @@ for env in bld.gen_python_environments():
realname='samba/dcerpc/ntlmssp.so'
)
 
-bld.SAMBA_PYTHON('python_srvsvc',
-source='../../librpc/gen_ndr/py_srvsvc.c',
-deps='RPC_NDR_SRVSVC pytalloc-util pyrpc_util',
-realname='samba/dcerpc/srvsvc.so'
-)
-
-bld.SAMBA_PYTHON('python_echo',
-   source='../../librpc/gen_ndr/py_echo.c',
-   deps='RPC_NDR_ECHO pytalloc-util pyrpc_util',
-   realname='samba/dcerpc/echo.so'
-   )
+   bld.SAMBA_PYTHON('python_srvsvc',
+   source='../../librpc/gen_ndr/py_srvsvc.c',
+   deps='RPC_NDR_SRVSVC pytalloc-util pyrpc_util',
+   realname='samba/dcerpc/srvsvc.so'
+   )
+
+   bld.SAMBA_PYTHON('python_echo',
+   source='../../librpc/gen_ndr/py_echo.c',
+   deps='RPC_NDR_ECHO pytalloc-util pyrpc_util',
+   realname='samba/dcerpc/echo.so'
+   )
 
-bld.SAMBA_PYTHON('python_dns',
-   source='../../librpc/gen_ndr/py_dns.c',
-   deps='NDR_DNS pytalloc-util pyrpc_util',
-   realname='samba/dcerpc/dns.so'
-   )
+   bld.SAMBA_PYTHON('python_dns',
+   source='../../librpc/gen_ndr/py_dns.c',
+   deps='NDR_DNS pytalloc-util pyrpc_util',
+   realname='samba/dcerpc/dns.so'
+   )
 
-bld.SAMBA_PYTHON('python_winreg',
-   source='../../librpc/gen_ndr/py_winreg.c',
-   deps='RPC_NDR_WINREG pytalloc-util pyrpc_util',
-   realname='samba/dcerpc/winreg.so'
-   )
+   bld.SAMBA_PYTHON('python_winreg',
+   source='../../librpc/gen_ndr/py_winreg.c',
+   deps='RPC_NDR_WINREG pytalloc-util pyrpc_util',
+   realname='samba/dcerpc/winreg.so'
+   )
 
 
-bld.SAMBA_PYTHON('python_initshutdown',
-   source='../../librpc/gen_ndr/py_initshutdown.c',
-   deps='RPC_NDR_INITSHUTDOWN pytalloc-util pyrpc_util',
-   realname='samba/dcerpc/initshutdown.so'
-   )
+   bld.SAMBA_PYTHON('python_initshutdown',
+   source='../../librpc/gen_ndr/py_initshutdown.c',
+   deps='RPC_NDR_INITSHUTDOWN