The branch, master has been updated
via 4447bd96b90ce4bfca793d482f9dcbd98e6579a5 (commit)
via de2a9fb60704eda5ba22e5d3b14111628acef2e8 (commit)
via 11fa3ed9ee1a05aabdba902db9899dfeb664b324 (commit)
via 5f8df164716a43bd9e6c22dfd1f066bf96ccf273 (commit)
via a817cff5a0f17c6a8b35013483a18c70acdfaa1c (commit)
via 295c3724a30013c572d3a3fdd3a8acc6ed19c546 (commit)
via cb53b780803bc9a6dc02b16a64abe408727f69b4 (commit)
via dbedfc318e2984238ee0acdb19a1a70fda8f4381 (commit)
via 5b4cb31ef1359d8c39dbffc028abb68652cc2186 (commit)
via de04e00ec2bf823f90a464416e88231e97f8df59 (commit)
from 63a6ca084d55db95abea7abffdbe27b55f2b002f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4447bd96b90ce4bfca793d482f9dcbd98e6579a5
Author: Jelmer Vernooij <jel...@samba.org>
Date: Sun Jul 19 17:18:04 2009 +0200
Include ntsvc NDR in libndr-standard.
commit de2a9fb60704eda5ba22e5d3b14111628acef2e8
Author: Jelmer Vernooij <jel...@samba.org>
Date: Sun Jul 19 17:17:23 2009 +0200
Remove unused variable.
commit 11fa3ed9ee1a05aabdba902db9899dfeb664b324
Author: Slava Semushin <php-co...@altlinux.ru>
Date: Sat Jul 18 23:30:33 2009 +0700
source4/lib/registry/patchfile.c(reg_diff_load): fixed possible resource
leak.
File descriptor leaks when write(2) fails and we are returning from
function.
Found by cppcheck:
[./source4/lib/registry/patchfile.c:319]: (error) Resource leak: fd
commit 5f8df164716a43bd9e6c22dfd1f066bf96ccf273
Author: Slava Semushin <php-co...@altlinux.ru>
Date: Sat Jul 18 16:28:53 2009 +0700
lib/util/util_file.c(file_save): fixed file descriptor leak when read(2)
fails.
Found by cppcheck:
[./lib/util/util_file.c:383]: (error) Resource leak: fd
commit a817cff5a0f17c6a8b35013483a18c70acdfaa1c
Author: Matthieu Patou <mat+informatique.sa...@matws.net>
Date: Sat Jul 11 15:57:35 2009 +0200
Fix broken password quality check
This fixes broken password tests when the passwords contain non ASCII
characters
(e.g. accentuated chars like ('e, `e, ...)
commit 295c3724a30013c572d3a3fdd3a8acc6ed19c546
Author: Matthias Dieter Wallnöfer <mwallnoe...@yahoo.de>
Date: Wed Jul 15 13:25:04 2009 +0200
Fix typo
commit cb53b780803bc9a6dc02b16a64abe408727f69b4
Author: Matthias Dieter Wallnöfer <mwallnoe...@yahoo.de>
Date: Fri Jul 17 18:13:28 2009 +0200
[SAMBA 4] Some cosmetic changes for the LDB modules
Some corrections which make the code a bit more readable (no functional
changes here)
commit dbedfc318e2984238ee0acdb19a1a70fda8f4381
Author: Matt Kraai <mkr...@beckman.com>
Date: Thu Jul 9 09:45:28 2009 -0700
include unix.h if it's available
commit 5b4cb31ef1359d8c39dbffc028abb68652cc2186
Author: Matthias Dieter Wallnöfer <mwallnoe...@yahoo.de>
Date: Thu Jul 9 17:54:42 2009 +0200
Cosmetic correction
Changes the order of two commands. First set up the "priv" structure, then
assign it to the "ntvfs" structure.
commit de04e00ec2bf823f90a464416e88231e97f8df59
Author: Jelmer Vernooij <jel...@samba.org>
Date: Sun Jul 19 15:39:52 2009 +0200
Merge more ndr interfaces into libndr-standard.
-----------------------------------------------------------------------
Summary of changes:
lib/replace/libreplace.m4 | 1 +
lib/replace/replace.h | 4 +
lib/util/genrand.c | 3 +-
lib/util/tests/genrand.c | 2 +
lib/util/util_file.c | 1 +
source4/dsdb/samdb/ldb_modules/linked_attributes.c | 11 +--
source4/dsdb/samdb/ldb_modules/password_hash.c | 13 ++--
source4/lib/registry/patchfile.c | 1 +
source4/libcli/security/security_token.c | 2 +-
source4/librpc/config.mk | 89 ++++++--------------
source4/ntvfs/unixuid/vfs_unixuid.c | 2 +-
source4/rpc_server/config.mk | 4 +-
source4/torture/rpc/object_uuid.c | 1 -
13 files changed, 52 insertions(+), 82 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/libreplace.m4 b/lib/replace/libreplace.m4
index 2d90d9c..a3a26ef 100644
--- a/lib/replace/libreplace.m4
+++ b/lib/replace/libreplace.m4
@@ -103,6 +103,7 @@ AC_CHECK_HEADERS(sys/time.h time.h)
AC_CHECK_HEADERS(stdarg.h vararg.h)
AC_CHECK_HEADERS(sys/mount.h mntent.h)
AC_CHECK_HEADERS(stropts.h)
+AC_CHECK_HEADERS(unix.h)
AC_CHECK_FUNCS(seteuid setresuid setegid setresgid chroot bzero strerror)
AC_CHECK_FUNCS(vsyslog setlinebuf mktime ftruncate chsize rename)
diff --git a/lib/replace/replace.h b/lib/replace/replace.h
index fe1f732..2db6aa1 100644
--- a/lib/replace/replace.h
+++ b/lib/replace/replace.h
@@ -258,6 +258,10 @@ char *rep_realpath(const char *path, char *resolved_path);
int rep_lchown(const char *fname,uid_t uid,gid_t gid);
#endif
+#ifdef HAVE_UNIX_H
+#include <unix.h>
+#endif
+
#ifndef HAVE_SETLINEBUF
#define setlinebuf rep_setlinebuf
void rep_setlinebuf(FILE *);
diff --git a/lib/util/genrand.c b/lib/util/genrand.c
index cd1823a..c51f938 100644
--- a/lib/util/genrand.c
+++ b/lib/util/genrand.c
@@ -294,6 +294,7 @@ _PUBLIC_ uint32_t generate_random(void)
_PUBLIC_ bool check_password_quality(const char *s)
{
int has_digit=0, has_capital=0, has_lower=0, has_special=0, has_high=0;
+ char* reals = s;
while (*s) {
if (isdigit((unsigned char)*s)) {
has_digit |= 1;
@@ -310,7 +311,7 @@ _PUBLIC_ bool check_password_quality(const char *s)
}
return ((has_digit + has_lower + has_capital + has_special) >= 3
- || (has_high > strlen(s)/2));
+ || (has_high > strlen(reals)/2));
}
/**
diff --git a/lib/util/tests/genrand.c b/lib/util/tests/genrand.c
index 5fe229c..20a20ac 100644
--- a/lib/util/tests/genrand.c
+++ b/lib/util/tests/genrand.c
@@ -40,6 +40,8 @@ static bool test_check_password_quality(struct
torture_context *tctx)
torture_assert(tctx, !check_password_quality("aaaaaaaaaaaa"), "same
char password");
torture_assert(tctx, !check_password_quality("BLA"), "multiple upcases
password");
torture_assert(tctx, !check_password_quality("123"), "digits only");
+ torture_assert(tctx, !check_password_quality("matthiéu"), "not enough
high symbols");
+ torture_assert(tctx, check_password_quality("abcdééà çè"), "valid");
torture_assert(tctx, check_password_quality("A2e"), "valid");
torture_assert(tctx, check_password_quality("BA2eLi443"), "valid");
return true;
diff --git a/lib/util/util_file.c b/lib/util/util_file.c
index 0275e78..7466004 100644
--- a/lib/util/util_file.c
+++ b/lib/util/util_file.c
@@ -380,6 +380,7 @@ _PUBLIC_ bool file_save(const char *fname, const void
*packet, size_t length)
return false;
}
if (write(fd, packet, length) != (size_t)length) {
+ close(fd);
return false;
}
close(fd);
diff --git a/source4/dsdb/samdb/ldb_modules/linked_attributes.c
b/source4/dsdb/samdb/ldb_modules/linked_attributes.c
index 4e28c8a..9ed06a9 100644
--- a/source4/dsdb/samdb/ldb_modules/linked_attributes.c
+++ b/source4/dsdb/samdb/ldb_modules/linked_attributes.c
@@ -741,15 +741,15 @@ static int la_op_search_callback(struct ldb_request *req,
if (ret != LDB_SUCCESS) {
return ldb_module_done(ac->req, NULL, NULL,
ret);
}
- break;
- case LDB_RENAME:
-
+ return ret;
+
+ case LDB_RENAME:
+ /* start the mod requests chain */
ret = la_do_mod_request(ac);
if (ret != LDB_SUCCESS) {
return ldb_module_done(ac->req, NULL, NULL,
ret);
- }
-
+ }
return ret;
default:
@@ -759,7 +759,6 @@ static int la_op_search_callback(struct ldb_request *req,
return ldb_module_done(ac->req, NULL, NULL,
LDB_ERR_OPERATIONS_ERROR);
}
- return LDB_SUCCESS;
}
talloc_free(ares);
diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c
b/source4/dsdb/samdb/ldb_modules/password_hash.c
index ef641ac..c7fa636 100644
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -1400,33 +1400,33 @@ static int setup_password_fields(struct
setup_password_fields_io *io)
}
ret = setup_kerberos_keys(io);
- if (ret != 0) {
+ if (ret != LDB_SUCCESS) {
return ret;
}
}
ret = setup_nt_fields(io);
- if (ret != 0) {
+ if (ret != LDB_SUCCESS) {
return ret;
}
ret = setup_lm_fields(io);
- if (ret != 0) {
+ if (ret != LDB_SUCCESS) {
return ret;
}
ret = setup_supplemental_field(io);
- if (ret != 0) {
+ if (ret != LDB_SUCCESS) {
return ret;
}
ret = setup_last_set_field(io);
- if (ret != 0) {
+ if (ret != LDB_SUCCESS) {
return ret;
}
ret = setup_kvno_field(io);
- if (ret != 0) {
+ if (ret != LDB_SUCCESS) {
return ret;
}
@@ -1649,6 +1649,7 @@ static int get_domain_data_callback(struct ldb_request
*req,
if (ret != LDB_SUCCESS) {
return ldb_module_done(ac->req, NULL, NULL, ret);
}
+ break;
case LDB_REPLY_REFERRAL:
/* ignore */
diff --git a/source4/lib/registry/patchfile.c b/source4/lib/registry/patchfile.c
index 9258069..24d86ab 100644
--- a/source4/lib/registry/patchfile.c
+++ b/source4/lib/registry/patchfile.c
@@ -316,6 +316,7 @@ _PUBLIC_ WERROR reg_diff_load(const char *filename,
if (read(fd, &hdr, 4) != 4) {
DEBUG(0, ("Error reading registry patch file `%s'\n",
filename));
+ close(fd);
return WERR_GENERAL_FAILURE;
}
diff --git a/source4/libcli/security/security_token.c
b/source4/libcli/security/security_token.c
index e1349e0..0764dfe 100644
--- a/source4/libcli/security/security_token.c
+++ b/source4/libcli/security/security_token.c
@@ -1,7 +1,7 @@
/*
Unix SMB/CIFS implementation.
- security descriptror utility functions
+ security descriptor utility functions
Copyright (C) Andrew Tridgell 2004
Copyright (C) Stefan Metzmacher 2005
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 0d6ece5..9e3d6b2 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -79,10 +79,6 @@ PUBLIC_DEPENDENCIES = LIBNDR
NDR_WINSTATION_OBJ_FILES = $(gen_ndrsrcdir)/ndr_winstation.o
-[SUBSYSTEM::NDR_ECHO]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-
[SUBSYSTEM::NDR_IRPC]
PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY NDR_NBT
@@ -162,35 +158,6 @@ NDR_SPOOLSS_OBJ_FILES = ../librpc/gen_ndr/ndr_spoolss.o
NDR_SPOOLSS_BUF_OBJ_FILES = ../librpc/ndr/ndr_spoolss_buf.o
-[SUBSYSTEM::NDR_WKSSVC]
-PUBLIC_DEPENDENCIES = LIBNDR NDR_SRVSVC NDR_SECURITY
-
-NDR_WKSSVC_OBJ_FILES = ../librpc/gen_ndr/ndr_wkssvc.o
-
-[SUBSYSTEM::NDR_SRVSVC]
-PUBLIC_DEPENDENCIES = LIBNDR NDR_SVCCTL NDR_SECURITY
-
-NDR_SRVSVC_OBJ_FILES = ../librpc/gen_ndr/ndr_srvsvc.o
-
-[SUBSYSTEM::NDR_SVCCTL]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_SVCCTL_OBJ_FILES = ../librpc/gen_ndr/ndr_svcctl.o
../librpc/ndr/ndr_svcctl.o
-
-PUBLIC_HEADERS += $(addprefix ../librpc/gen_ndr/, ndr_svcctl.h svcctl.h)
-
-[SUBSYSTEM::NDR_ATSVC]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_ATSVC_OBJ_FILES = ../librpc/gen_ndr/ndr_atsvc.o
-
-PUBLIC_HEADERS += $(addprefix ../librpc/gen_ndr/, atsvc.h ndr_atsvc.h)
-
-[SUBSYSTEM::NDR_EVENTLOG]
-PUBLIC_DEPENDENCIES = LIBNDR NDR_STANDARD
-
-NDR_EVENTLOG_OBJ_FILES = ../librpc/gen_ndr/ndr_eventlog.o
-
[SUBSYSTEM::NDR_EPMAPPER]
PUBLIC_DEPENDENCIES = LIBNDR
@@ -216,16 +183,6 @@ PUBLIC_DEPENDENCIES = LIBNDR
NDR_WINS_OBJ_FILES = $(gen_ndrsrcdir)/ndr_wins.o
-[SUBSYSTEM::NDR_WINREG]
-PUBLIC_DEPENDENCIES = LIBNDR NDR_INITSHUTDOWN NDR_SECURITY
-
-NDR_WINREG_OBJ_FILES = ../librpc/gen_ndr/ndr_winreg.o
-
-[SUBSYSTEM::NDR_INITSHUTDOWN]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_INITSHUTDOWN_OBJ_FILES = ../librpc/gen_ndr/ndr_initshutdown.o
-
[SUBSYSTEM::NDR_MGMT]
PUBLIC_DEPENDENCIES = LIBNDR
@@ -271,11 +228,6 @@ PUBLIC_DEPENDENCIES = LIBNDR
NDR_SCERPC_OBJ_FILES = ../librpc/gen_ndr/ndr_scerpc.o
-[SUBSYSTEM::NDR_NTSVCS]
-PUBLIC_DEPENDENCIES = LIBNDR
-
-NDR_NTSVCS_OBJ_FILES = ../librpc/gen_ndr/ndr_ntsvcs.o
-
[SUBSYSTEM::NDR_TRKWKS]
PUBLIC_DEPENDENCIES = LIBNDR
@@ -312,7 +264,7 @@ PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT
NDR_SCHANNEL_OBJ_FILES = $(gen_ndrsrcdir)/ndr_schannel.o
[SUBSYSTEM::NDR_NBT]
-PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT_BUF NDR_SVCCTL NDR_SECURITY NDR_STANDARD
LIBCLI_NDR_NETLOGON
+PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT_BUF NDR_SECURITY NDR_STANDARD
LIBCLI_NDR_NETLOGON
NDR_NBT_OBJ_FILES = ../librpc/gen_ndr/ndr_nbt.o
@@ -356,11 +308,20 @@ NDR_STANDARD_OBJ_FILES = ../librpc/gen_ndr/ndr_echo.o \
../librpc/gen_ndr/ndr_samr.o \
../librpc/gen_ndr/ndr_netlogon.o \
../librpc/ndr/ndr_netlogon.o \
- ../librpc/gen_ndr/ndr_dfs.o
+ ../librpc/gen_ndr/ndr_dfs.o \
+ ../librpc/gen_ndr/ndr_atsvc.o \
+ ../librpc/gen_ndr/ndr_wkssvc.o
\
+ ../librpc/gen_ndr/ndr_srvsvc.o
\
+ ../librpc/gen_ndr/ndr_svcctl.o
\
+ ../librpc/ndr/ndr_svcctl.o \
+ ../librpc/gen_ndr/ndr_winreg.o
\
+
../librpc/gen_ndr/ndr_initshutdown.o \
+
../librpc/gen_ndr/ndr_eventlog.o \
+ ../librpc/gen_ndr/ndr_ntsvcs.o
PC_FILES += $(librpcsrcdir)/ndr_standard.pc
-PUBLIC_HEADERS += $(addprefix ../librpc/gen_ndr/, samr.h ndr_samr.h lsa.h
netlogon.h)
+PUBLIC_HEADERS += $(addprefix ../librpc/gen_ndr/, samr.h ndr_samr.h lsa.h
netlogon.h atsvc.h ndr_atsvc.h ndr_svcctl.h svcctl.h)
NDR_STANDARD_VERSION = 0.0.1
NDR_STANDARD_SOVERSION = 0
@@ -370,13 +331,13 @@ PUBLIC_DEPENDENCIES = \
NDR_STANDARD \
NDR_AUDIOSRV \
NDR_DSBACKUP NDR_EFS NDR_DRSUAPI \
- NDR_POLICYAGENT NDR_UNIXINFO NDR_SPOOLSS NDR_WKSSVC NDR_SRVSVC
NDR_ATSVC \
- NDR_EVENTLOG NDR_EPMAPPER NDR_DBGIDL NDR_DSSETUP NDR_MSGSVC NDR_WINS \
- NDR_WINREG NDR_MGMT NDR_PROTECTED_STORAGE NDR_OXIDRESOLVER \
- NDR_REMACT NDR_WZCSVC NDR_BROWSER NDR_W32TIME NDR_SCERPC NDR_NTSVCS \
+ NDR_POLICYAGENT NDR_UNIXINFO NDR_SPOOLSS \
+ NDR_EPMAPPER NDR_DBGIDL NDR_DSSETUP NDR_MSGSVC NDR_WINS \
+ NDR_MGMT NDR_PROTECTED_STORAGE NDR_OXIDRESOLVER \
+ NDR_REMACT NDR_WZCSVC NDR_BROWSER NDR_W32TIME NDR_SCERPC \
NDR_TRKWKS NDR_KEYSVC NDR_KRB5PAC NDR_XATTR NDR_SCHANNEL \
- NDR_ROT NDR_DRSBLOBS NDR_SVCCTL NDR_NBT NDR_WINSREPL NDR_SECURITY \
- NDR_INITSHUTDOWN NDR_DNSSERVER NDR_WINSTATION NDR_IRPC NDR_OPENDB \
+ NDR_ROT NDR_DRSBLOBS NDR_NBT NDR_WINSREPL NDR_SECURITY \
+ NDR_DNSSERVER NDR_WINSTATION NDR_IRPC NDR_OPENDB \
NDR_SASL_HELPERS NDR_NOTIFY NDR_WINBIND NDR_FRSRPC NDR_FRSAPI
NDR_NFS4ACL NDR_NTP_SIGND \
NDR_DCOM NDR_WMI NDR_NAMED_PIPE_AUTH
@@ -464,7 +425,7 @@ PUBLIC_DEPENDENCIES = dcerpc NDR_SPOOLSS
RPC_NDR_SPOOLSS_OBJ_FILES = ../librpc/gen_ndr/ndr_spoolss_c.o
[SUBSYSTEM::RPC_NDR_WKSSVC]
-PUBLIC_DEPENDENCIES = dcerpc NDR_WKSSVC
+PUBLIC_DEPENDENCIES = dcerpc NDR_STANDARD
RPC_NDR_WKSSVC_OBJ_FILES = ../librpc/gen_ndr/ndr_wkssvc_c.o
@@ -474,14 +435,14 @@ PUBLIC_DEPENDENCIES = dcerpc NDR_SRVSVC
RPC_NDR_SRVSVC_OBJ_FILES = ../librpc/gen_ndr/ndr_srvsvc_c.o
[SUBSYSTEM::RPC_NDR_SVCCTL]
-PUBLIC_DEPENDENCIES = dcerpc NDR_SVCCTL
+PUBLIC_DEPENDENCIES = dcerpc NDR_STANDARD
RPC_NDR_SVCCTL_OBJ_FILES = ../librpc/gen_ndr/ndr_svcctl_c.o
PUBLIC_HEADERS += ../librpc/gen_ndr/ndr_svcctl_c.h
[LIBRARY::dcerpc_atsvc]
-PUBLIC_DEPENDENCIES = dcerpc NDR_ATSVC
+PUBLIC_DEPENDENCIES = dcerpc NDR_STANDARD
dcerpc_atsvc_VERSION = 0.0.1
dcerpc_atsvc_SOVERSION = 0
@@ -492,7 +453,7 @@ PC_FILES += $(librpcsrcdir)/dcerpc_atsvc.pc
PUBLIC_HEADERS += ../librpc/gen_ndr/ndr_atsvc_c.h
[SUBSYSTEM::RPC_NDR_EVENTLOG]
-PUBLIC_DEPENDENCIES = dcerpc NDR_EVENTLOG
+PUBLIC_DEPENDENCIES = dcerpc NDR_STANDARD
RPC_NDR_EVENTLOG_OBJ_FILES = ../librpc/gen_ndr/ndr_eventlog_c.o
@@ -522,12 +483,12 @@ PUBLIC_DEPENDENCIES = dcerpc NDR_WINS
RPC_NDR_WINS_OBJ_FILES = $(gen_ndrsrcdir)/ndr_wins_c.o
[SUBSYSTEM::RPC_NDR_WINREG]
-PUBLIC_DEPENDENCIES = dcerpc NDR_WINREG
+PUBLIC_DEPENDENCIES = dcerpc NDR_STANDARD
RPC_NDR_WINREG_OBJ_FILES = ../librpc/gen_ndr/ndr_winreg_c.o
[SUBSYSTEM::RPC_NDR_INITSHUTDOWN]
-PUBLIC_DEPENDENCIES = dcerpc NDR_INITSHUTDOWN
+PUBLIC_DEPENDENCIES = dcerpc NDR_STANDARD
RPC_NDR_INITSHUTDOWN_OBJ_FILES = ../librpc/gen_ndr/ndr_initshutdown_c.o
@@ -567,7 +528,7 @@ PUBLIC_DEPENDENCIES = dcerpc NDR_SCERPC
RPC_NDR_SCERPC_OBJ_FILES = ../librpc/gen_ndr/ndr_scerpc_c.o
[SUBSYSTEM::RPC_NDR_NTSVCS]
-PUBLIC_DEPENDENCIES = dcerpc NDR_NTSVCS
+PUBLIC_DEPENDENCIES = dcerpc NDR_STANDARD
RPC_NDR_NTSVCS_OBJ_FILES = ../librpc/gen_ndr/ndr_ntsvcs_c.o
diff --git a/source4/ntvfs/unixuid/vfs_unixuid.c
b/source4/ntvfs/unixuid/vfs_unixuid.c
index 3ef341d..97c306f 100644
--- a/source4/ntvfs/unixuid/vfs_unixuid.c
+++ b/source4/ntvfs/unixuid/vfs_unixuid.c
@@ -310,9 +310,9 @@ static NTSTATUS unixuid_connect(struct ntvfs_module_context
*ntvfs,
return NT_STATUS_INTERNAL_ERROR;
}
- ntvfs->private_data = priv;
priv->last_sec_ctx = NULL;
priv->last_token = NULL;
+ ntvfs->private_data = priv;
tevent_loop_set_nesting_hook(ntvfs->ctx->event_ctx,
unixuid_event_nesting_hook,
diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk
index 4b5b5cf..32669db 100644
--- a/source4/rpc_server/config.mk
+++ b/source4/rpc_server/config.mk
@@ -69,7 +69,7 @@ $(eval $(call
proto_header_template,$(rpc_serversrcdir)/srvsvc/proto.h,$(dcerpc_
INIT_FUNCTION = dcerpc_server_wkssvc_init
SUBSYSTEM = dcerpc_server
PRIVATE_DEPENDENCIES = \
- DCERPC_COMMON NDR_WKSSVC
+ DCERPC_COMMON NDR_STANDARD
# End MODULE dcerpc_wkssvc
################################################
@@ -114,7 +114,7 @@ INIT_FUNCTION = dcerpc_server_winreg_init
SUBSYSTEM = dcerpc_server
OUTPUT_TYPE = MERGED_OBJ
PRIVATE_DEPENDENCIES = \
- registry NDR_WINREG
+ registry NDR_STANDARD
# End MODULE dcerpc_winreg
################################################
diff --git a/source4/torture/rpc/object_uuid.c
b/source4/torture/rpc/object_uuid.c
index a702666..53d03a3 100644
--- a/source4/torture/rpc/object_uuid.c
+++ b/source4/torture/rpc/object_uuid.c
@@ -35,7 +35,6 @@ static bool test_random_uuid(struct torture_context *torture)
{
NTSTATUS status;
struct dcerpc_pipe *p1, *p2;
- struct rpc_request *req;
struct GUID uuid;
struct dssetup_DsRoleGetPrimaryDomainInformation r1;
struct lsa_GetUserName r2;
--
Samba Shared Repository
