[SCM] Samba Shared Repository - branch v3-6-test updated
Günther Deschner
gd at samba.org
Thu Feb 10 06:02:10 MST 2011
The branch, v3-6-test has been updated
via 3d8a5c6 librpc: move preg.idl to main directory.
via 3cb75d8 s3-waf: fix krb5 checks logic.
via eebfe86 s3: give ../librpc/ndr/util.c its own header.
from 6c231c2 Put OpenDir() back the way it was - don't overload with an fsp arg. Create OpenDir_fsp for new usage. (cherry picked from commit 558eeb860e3e3475f5ab39c52fab3414b5b8b478)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 3d8a5c6311c9aa495532c8ea9cc47b1fef3c0dd1
Author: Günther Deschner <gd at samba.org>
Date: Thu Feb 10 12:54:27 2011 +0100
librpc: move preg.idl to main directory.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Thu Feb 10 13:56:49 CET 2011 on sn-devel-104
(cherry picked from commit ad0a3185ce4d9918597d1de3decb9080b88277ef)
commit 3cb75d835f733a410de0dc914e544ac8c7adb5e9
Author: Günther Deschner <gd at samba.org>
Date: Thu Feb 10 12:42:47 2011 +0100
s3-waf: fix krb5 checks logic.
Guenther
(cherry picked from commit 7de21e62946fdd74250be56bd33e9598237307c5)
commit eebfe86ae676c781042fae080f60818c48bb1152
Author: Günther Deschner <gd at samba.org>
Date: Thu Feb 10 00:11:38 2011 +0100
s3: give ../librpc/ndr/util.c its own header.
Guenther
(cherry picked from commit fdd4d56405544b8c25fa3f24889726cb98506345)
-----------------------------------------------------------------------
Summary of changes:
{source3/librpc => librpc}/idl/preg.idl | 0
librpc/idl/wscript_build | 2 +-
{source3/librpc => librpc}/ndr/ndr_preg.c | 0
{source3/librpc => librpc}/ndr/ndr_preg.h | 0
librpc/wscript_build | 5 +++++
source3/Makefile.in | 5 ++---
source3/include/proto.h | 7 -------
source3/libads/ndr.c | 1 +
source3/librpc/idl/messaging.idl | 1 +
source3/librpc/idl/notify.idl | 1 +
source3/librpc/idl/wscript_build | 2 +-
source3/librpc/ndr/util.c | 1 +
source3/librpc/ndr/util.h | 7 +++++++
source3/librpc/wscript_build | 5 -----
source3/winbindd/winbindd_ndr.c | 1 +
source3/wscript | 11 ++++++-----
source4/librpc/wscript_build | 2 +-
17 files changed, 28 insertions(+), 23 deletions(-)
rename {source3/librpc => librpc}/idl/preg.idl (100%)
rename {source3/librpc => librpc}/ndr/ndr_preg.c (100%)
rename {source3/librpc => librpc}/ndr/ndr_preg.h (100%)
create mode 100644 source3/librpc/ndr/util.h
Changeset truncated at 500 lines:
diff --git a/source3/librpc/idl/preg.idl b/librpc/idl/preg.idl
similarity index 100%
rename from source3/librpc/idl/preg.idl
rename to librpc/idl/preg.idl
diff --git a/librpc/idl/wscript_build b/librpc/idl/wscript_build
index 6fdd5f3..08fe65f 100644
--- a/librpc/idl/wscript_build
+++ b/librpc/idl/wscript_build
@@ -25,6 +25,6 @@ bld.SAMBA_PIDL_LIST('PIDL',
output_dir='../gen_ndr')
bld.SAMBA_PIDL_LIST('PIDL',
- 'rap.idl dnsp.idl ntprinting.idl',
+ 'rap.idl dnsp.idl ntprinting.idl preg.idl',
options='--header --ndr-parser',
output_dir='../gen_ndr')
diff --git a/source3/librpc/ndr/ndr_preg.c b/librpc/ndr/ndr_preg.c
similarity index 100%
rename from source3/librpc/ndr/ndr_preg.c
rename to librpc/ndr/ndr_preg.c
diff --git a/source3/librpc/ndr/ndr_preg.h b/librpc/ndr/ndr_preg.h
similarity index 100%
rename from source3/librpc/ndr/ndr_preg.h
rename to librpc/ndr/ndr_preg.h
diff --git a/librpc/wscript_build b/librpc/wscript_build
index ebb1fd1..293a155 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -287,6 +287,11 @@ bld.SAMBA_SUBSYSTEM('NDR_BACKUPKEY',
public_deps='ndr'
)
+bld.SAMBA_SUBSYSTEM('NDR_PREG',
+ source='gen_ndr/ndr_preg.c ndr/ndr_preg.c',
+ public_deps='ndr'
+ )
+
bld.SAMBA_SUBSYSTEM('NDR_FILE_ID',
source='../librpc/gen_ndr/ndr_file_id.c',
public_deps='ndr'
diff --git a/source3/Makefile.in b/source3/Makefile.in
index f9d6a32..e1ab647 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -336,7 +336,7 @@ LIBNDR_NTPRINTING_OBJ = librpc/gen_ndr/ndr_ntprinting.o \
../librpc/ndr/ndr_ntprinting.o \
LIBNDR_PREG_OBJ = librpc/gen_ndr/ndr_preg.o \
- librpc/ndr/ndr_preg.o
+ ../librpc/ndr/ndr_preg.o
LIBNDR_XATTR_OBJ = librpc/gen_ndr/ndr_xattr.o \
../librpc/ndr/ndr_xattr.o
@@ -1576,8 +1576,7 @@ IDL_FILES = librpc/idl/messaging.idl \
librpc/idl/wbint.idl \
librpc/idl/perfcount.idl \
librpc/idl/secrets.idl \
- librpc/idl/libnet_join.idl \
- librpc/idl/preg.idl
+ librpc/idl/libnet_join.idl
samba3-idl::
@PIDL_OUTPUTDIR="librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 58585a1..a4e8ad5 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1570,13 +1570,6 @@ void wins_srv_tags_free(char **list);
struct in_addr wins_srv_ip_tag(const char *tag, struct in_addr src_ip);
unsigned wins_srv_count_tag(const char *tag);
-/* The following definitions come from librpc/ndr/util.c */
-
-enum ndr_err_code ndr_push_server_id(struct ndr_push *ndr, int ndr_flags, const struct server_id *r);
-enum ndr_err_code ndr_pull_server_id(struct ndr_pull *ndr, int ndr_flags, struct server_id *r);
-void ndr_print_server_id(struct ndr_print *ndr, const char *name, const struct server_id *r);
-_PUBLIC_ void ndr_print_sockaddr_storage(struct ndr_print *ndr, const char *name, const struct sockaddr_storage *ss);
-
/* The following definitions come from libsmb/cliconnect.c */
ADS_STATUS cli_session_setup_spnego(struct cli_state *cli, const char *user,
diff --git a/source3/libads/ndr.c b/source3/libads/ndr.c
index 843ae3b..603add0 100644
--- a/source3/libads/ndr.c
+++ b/source3/libads/ndr.c
@@ -22,6 +22,7 @@
#include "includes.h"
#include "ads.h"
#include "../librpc/gen_ndr/ndr_netlogon.h"
+#include "librpc/ndr/util.h"
void ndr_print_ads_auth_flags(struct ndr_print *ndr, const char *name, uint32_t r)
{
diff --git a/source3/librpc/idl/messaging.idl b/source3/librpc/idl/messaging.idl
index faa9a6e..22c3429 100644
--- a/source3/librpc/idl/messaging.idl
+++ b/source3/librpc/idl/messaging.idl
@@ -5,6 +5,7 @@
*/
[
+ helper("../librpc/ndr/util.h"),
pointer_default(unique)
]
interface messaging
diff --git a/source3/librpc/idl/notify.idl b/source3/librpc/idl/notify.idl
index e776d5d..592af19 100644
--- a/source3/librpc/idl/notify.idl
+++ b/source3/librpc/idl/notify.idl
@@ -10,6 +10,7 @@ import "file_id.idl";
*/
[
+ helper("../librpc/ndr/util.h"),
pointer_default(unique)
]
interface notify
diff --git a/source3/librpc/idl/wscript_build b/source3/librpc/idl/wscript_build
index 9957614..a337f4f 100644
--- a/source3/librpc/idl/wscript_build
+++ b/source3/librpc/idl/wscript_build
@@ -2,7 +2,7 @@
bld.SAMBA_PIDL_LIST('PIDL',
'''messaging.idl libnetapi.idl notify.idl
- perfcount.idl secrets.idl libnet_join.idl preg.idl''',
+ perfcount.idl secrets.idl libnet_join.idl''',
options='--includedir=../librpc/idl --header --ndr-parser',
output_dir='../gen_ndr')
diff --git a/source3/librpc/ndr/util.c b/source3/librpc/ndr/util.c
index b55b3d8..d4e06df 100644
--- a/source3/librpc/ndr/util.c
+++ b/source3/librpc/ndr/util.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "librpc/ndr/util.h"
enum ndr_err_code ndr_push_server_id(struct ndr_push *ndr, int ndr_flags, const struct server_id *r)
{
diff --git a/source3/librpc/ndr/util.h b/source3/librpc/ndr/util.h
new file mode 100644
index 0000000..3f7be6b
--- /dev/null
+++ b/source3/librpc/ndr/util.h
@@ -0,0 +1,7 @@
+
+/* The following definitions come from librpc/ndr/util.c */
+
+enum ndr_err_code ndr_push_server_id(struct ndr_push *ndr, int ndr_flags, const struct server_id *r);
+enum ndr_err_code ndr_pull_server_id(struct ndr_pull *ndr, int ndr_flags, struct server_id *r);
+void ndr_print_server_id(struct ndr_print *ndr, const char *name, const struct server_id *r);
+_PUBLIC_ void ndr_print_sockaddr_storage(struct ndr_print *ndr, const char *name, const struct sockaddr_storage *ss);
diff --git a/source3/librpc/wscript_build b/source3/librpc/wscript_build
index adf7f70..ae43531 100644
--- a/source3/librpc/wscript_build
+++ b/source3/librpc/wscript_build
@@ -20,11 +20,6 @@ bld.SAMBA_SUBSYSTEM('NDR_NOTIFY',
public_deps='ndr NDR_FILE_ID'
)
-bld.SAMBA_SUBSYSTEM('NDR_PREG',
- source='gen_ndr/ndr_preg.c ndr/ndr_preg.c',
- public_deps='ndr'
- )
-
bld.SAMBA_SUBSYSTEM('NDR_SECRETS',
source='gen_ndr/ndr_secrets.c',
public_deps='ndr'
diff --git a/source3/winbindd/winbindd_ndr.c b/source3/winbindd/winbindd_ndr.c
index 94aa7eb..2f26d8d 100644
--- a/source3/winbindd/winbindd_ndr.c
+++ b/source3/winbindd/winbindd_ndr.c
@@ -21,6 +21,7 @@
#include "winbindd.h"
#include "../librpc/gen_ndr/ndr_netlogon.h"
#include "../librpc/gen_ndr/ndr_security.h"
+#include "librpc/ndr/util.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_WINBIND
diff --git a/source3/wscript b/source3/wscript
index 3aa5d2a..655de13 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -845,25 +845,26 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab);
if Options.options.with_ads:
use_ads=True
- if not conf.CONFIG_SET('HAVE_ENCTYPE_ARCFOUR_HMAC_MD5'):
+ if not conf.CONFIG_SET('HAVE_ENCTYPE_ARCFOUR_HMAC_MD5') and \
+ not conf.CONFIG_SET('HAVE_ENCTYPE_ARCFOUR_HMAC'):
print "arcfour-hmac-md5 encryption type not found in -lkrb5"
use_ads=False
if not conf.CONFIG_SET('HAVE_KRB5_MK_REQ_EXTENDED'):
print "krb5_mk_req_extended not found in -lkrb5"
use_ads=False
- if not conf.CONFIG_SET('HAVE_KRB5_PRINCIPAL2SALT') or \
+ if not conf.CONFIG_SET('HAVE_KRB5_PRINCIPAL2SALT') and \
not conf.CONFIG_SET('HAVE_KRB5_GET_PW_SALT'):
print "no CREATE_KEY_FUNCTIONS detected"
use_ads=False
- if not conf.CONFIG_SET('HAVE_KRB5_GET_PERMITTED_ENCTYPES') or \
+ if not conf.CONFIG_SET('HAVE_KRB5_GET_PERMITTED_ENCTYPES') and \
not conf.CONFIG_SET('HAVE_KRB5_GET_DEFAULT_IN_TKT_ETYPES'):
print "no GET_ENCTYPES_FUNCTIONS detected"
use_ads=False
- if not conf.CONFIG_SET('HAVE_KRB5_KT_FREE_ENTRY') or \
+ if not conf.CONFIG_SET('HAVE_KRB5_KT_FREE_ENTRY') and \
not conf.CONFIG_SET('HAVE_KRB5_FREE_KEYTAB_ENTRY_CONTENTS'):
print "no KT_FREE_FUNCTION detected"
use_ads=False
- if not conf.CONFIG_SET('HAVE_KRB5_C_VERIFY_CHECKSUM') or \
+ if not conf.CONFIG_SET('HAVE_KRB5_C_VERIFY_CHECKSUM') and \
not conf.CONFIG_SET('HAVE_KRB5_VERIFY_CHECKSUM'):
print "no KRB5_VERIFY_CHECKSUM_FUNCTION detected"
use_ads=False
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index b07ca28..c1438a3 100755
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -117,7 +117,7 @@ bld.SAMBA_SUBSYSTEM('ndr-table',
NDR_SASL_HELPERS NDR_NOTIFY NDR_WINBIND NDR_FRSRPC NDR_FRSAPI
NDR_FRSTRANS NDR_NFS4ACL NDR_NTP_SIGND NDR_DCOM NDR_WMI
NDR_NAMED_PIPE_AUTH NDR_NTLMSSP NDR_DFSBLOBS NDR_DNSP
- NDR_NTPRINTING NDR_DNS NDR_BACKUPKEY''',
+ NDR_NTPRINTING NDR_DNS NDR_BACKUPKEY NDR_PREG''',
depends_on='GEN_NDR_TABLES'
)
--
Samba Shared Repository
More information about the samba-cvs
mailing list