Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
authorJelmer Vernooij <jelmer@samba.org>
Fri, 25 Apr 2008 09:04:20 +0000 (10:04 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 25 Apr 2008 09:04:20 +0000 (10:04 +0100)
Conflicts:

source/Makefile
source/auth/config.mk
source/auth/gensec/config.mk
source/build/m4/public.m4
source/build/make/python.mk
source/build/make/rules.mk
source/build/smb_build/header.pm
source/build/smb_build/main.pl
source/build/smb_build/makefile.pm
source/dsdb/config.mk
source/dsdb/samdb/ldb_modules/config.mk
source/kdc/config.mk
source/lib/events/config.mk
source/lib/events/events.c
source/lib/ldb/config.mk
source/lib/nss_wrapper/config.mk
source/lib/policy/config.mk
source/lib/util/config.mk
source/libcli/smb2/config.mk
source/libnet/config.mk
source/librpc/config.mk
source/nbt_server/config.mk
source/ntptr/ntptr_base.c
source/ntvfs/posix/config.mk
source/ntvfs/sysdep/config.mk
source/param/config.mk
source/rpc_server/config.mk
source/rpc_server/service_rpc.c
source/scripting/ejs/config.mk
source/scripting/python/config.mk
source/smb_server/config.mk
source/smbd/server.c
source/torture/config.mk
source/torture/smb2/config.mk
source/wrepl_server/config.mk
(This used to be commit 13bbd420681519894a4036729c43273912c9b402)

19 files changed:
1  2 
source4/auth/config.mk
source4/auth/gensec/gensec.c
source4/build/m4/public.m4
source4/build/make/rules.mk
source4/build/smb_build/main.pl
source4/build/smb_build/makefile.pm
source4/dsdb/samdb/ldb_modules/config.mk
source4/lib/events/events.c
source4/lib/registry/local.c
source4/librpc/config.mk
source4/ntptr/ntptr_base.c
source4/ntvfs/sysdep/sys_notify.c
source4/param/config.mk
source4/param/share.c
source4/rpc_server/service_rpc.c
source4/scripting/ejs/config.mk
source4/scripting/python/config.mk
source4/scripting/python/modules.c
source4/torture/smbtorture.c

@@@ -85,11 -85,13 +85,11 @@@ auth_unix_OBJ_FILES = $(addprefix auth/
  [SUBSYSTEM::PAM_ERRORS]
  PRIVATE_PROTO_HEADER = pam_errors.h
  
 -#VERSION = 0.0.1
 -#SO_VERSION = 0
  PAM_ERRORS_OBJ_FILES = $(addprefix auth/, pam_errors.o)
  
- [MODULE::service_auth]
+ [MODULE::auth]
  INIT_FUNCTION = server_service_auth_init
 -SUBSYSTEM = service
 +SUBSYSTEM = smbd
  PRIVATE_PROTO_HEADER = auth_proto.h
  PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSECURITY SAMDB CREDENTIALS 
  
Simple merge
@@@ -43,10 -41,10 +41,10 @@@ dnl SMB_LIBRARY(name,obj_files,required
  AC_DEFUN([SMB_LIBRARY],
  [
  MAKE_SETTINGS="$MAKE_SETTINGS
 -$1_ENABLE = YES
+ $1_CFLAGS = $6
+ $1_LDFLAGS = $7
++n1_ENABLE = YES
  $1_OBJ_FILES = $2
- $1_CFLAGS = $4
- $1_LDFLAGS = $5
- $1_ENABLE = YES
  "
  
  SMB_INFO_LIBRARIES="$SMB_INFO_LIBRARIES
@@@ -211,10 -211,12 +211,11 @@@ include/includes.d: include/includes.
        @echo "Compiling $<"
        @-mkdir -p `dirname $@`
        @$(COMPILE) && exit 0 ; \
-       $(COMPILE) 
+               echo "The following command failed:" 1>&2;\
+               echo "$(COMPILE)" 1>&2;\
+               $(COMPILE) >/dev/null 2>&1
  
  
 -
  .c.ho:
        @echo "Compiling $< with host compiler"
        @-mkdir -p `dirname $@`
@@@ -50,9 -50,12 +49,9 @@@ foreach my $key (values %$OUTPUT) 
  foreach my $key (values %$OUTPUT) {
        next unless defined $key->{OUTPUT_TYPE};
  
 +      $mkenv->StaticLibraryPrimitives($key) if grep(/STATIC_LIBRARY/, @{$key->{OUTPUT_TYPE}});
        $mkenv->MergedObj($key) if grep(/MERGED_OBJ/, @{$key->{OUTPUT_TYPE}});
 -      $mkenv->StaticLibraryPrimitives($key) if grep(/STATIC_LIBRARY/, @{$key->{OUTPUT_TYPE}});
 -      if (defined($key->{PC_FILE})) {
 -              $mkenv->output("PC_FILES += $key->{BASEDIR}/$key->{PC_FILE}\n");
 -      } 
--      $mkenv->SharedLibraryPrimitives($key) if ($key->{TYPE} eq "LIBRARY") and
++      $kenv->SharedLibraryPrimitives($key) if ($key->{TYPE} eq "LIBRARY") and
                                        grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}});
        if ($key->{TYPE} eq "LIBRARY" and 
            ${$key->{OUTPUT_TYPE}}[0] eq "SHARED_LIBRARY") {
@@@ -73,17 -76,15 +72,16 @@@ foreach my $key (values %$OUTPUT) 
  
  foreach my $key (values %$OUTPUT) {
        next unless defined $key->{OUTPUT_TYPE};
        $mkenv->StaticLibrary($key) if grep(/STATIC_LIBRARY/, @{$key->{OUTPUT_TYPE}});
        $mkenv->SharedLibrary($key) if ($key->{TYPE} eq "LIBRARY") and
                                        grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}});
 -      $mkenv->SharedModule($key) if ($key->{TYPE} eq "MODULE" or 
 -                                                                 $key->{TYPE} eq "PYTHON") and
 -                                      grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}});
 +      $mkenv->SharedModule($key) if ($key->{TYPE} eq "MODULE" and
 +                                      grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}}));
 +      $mkenv->PythonModule($key) if ($key->{TYPE} eq "PYTHON");
        $mkenv->Binary($key) if grep(/BINARY/, @{$key->{OUTPUT_TYPE}});
-       $mkenv->ProtoHeader($key) if defined($key->{PRIVATE_PROTO_HEADER}) or 
-                                        defined($key->{PUBLIC_PROTO_HEADER});
+       $mkenv->ProtoHeader($key) if defined($key->{PRIVATE_PROTO_HEADER});
 +      $mkenv->InitFunctions($key) if defined($key->{INIT_FUNCTIONS});
  }
  
  $mkenv->write("data.mk");
@@@ -127,18 -159,57 +127,26 @@@ sub SharedModule($$
        $self->_prepare_list($ctx, "DEPEND_LIST");
        $self->_prepare_list($ctx, "LINK_FLAGS");
  
 -      if (defined($ctx->{INIT_FUNCTION}) and $ctx->{TYPE} ne "PYTHON" and 
 -              $ctx->{INIT_FUNCTION_TYPE} =~ /\(\*\)/) {
 -              my $init_fn = $ctx->{INIT_FUNCTION_TYPE};
 -              $init_fn =~ s/\(\*\)/init_module/;
 -              my $proto_fn = $ctx->{INIT_FUNCTION_TYPE};
 -              $proto_fn =~ s/\(\*\)/$ctx->{INIT_FUNCTION}/;
 -
 -              $self->output(<< "__EOD__"
 -bin/$ctx->{NAME}_init_module.c:
 -      \@echo Creating \$\@
 -      \@echo \"#include \\\"includes.h\\\"\" > \$\@
 -      \@echo \"$proto_fn;\" >> \$\@
 -      \@echo \"_PUBLIC_ $init_fn\" >> \$\@
 -      \@echo \"{\" >> \$\@
 -      \@echo \"       return $ctx->{INIT_FUNCTION}();\" >> \$\@
 -      \@echo \"}\" >> \$\@
 -      \@echo \"\" >> \$\@
 -__EOD__
 -);
 -              $init_obj = "bin/$ctx->{NAME}_init_module.o";
 +      if (defined($ctx->{INIT_FUNCTION}) and $ctx->{INIT_FUNCTION_TYPE} =~ /\(\*\)/) {
 +              $self->output("\$($ctx->{NAME}_OBJ_FILES): CFLAGS+=-D$ctx->{INIT_FUNCTION}=init_module\n");
        }
  
 -      $self->output(<< "__EOD__"
 -#
 +      $self->output("\$(eval \$(call shared_module_template,$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}, \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_FULL_OBJ_LIST), \$($ctx->{NAME}\_FULL_OBJ_LIST) \$($ctx->{NAME}_LINK_FLAGS)))\n");
  
 -$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}: \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_FULL_OBJ_LIST) $init_obj
 -      \@echo Linking \$\@
 -      \@mkdir -p $ctx->{SHAREDDIR}
 -      \@\$(MDLD) \$(LDFLAGS) \$(MDLD_FLAGS) \$(INTERN_LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
 -              \$($ctx->{NAME}\_FULL_OBJ_LIST) $init_obj \\
 -              \$($ctx->{NAME}_LINK_FLAGS)
 -__EOD__
 -);
  
        if (defined($ctx->{ALIASES})) {
 -              foreach (@{$ctx->{ALIASES}}) {
 -                      $self->output("\t\@rm -f $ctx->{SHAREDDIR}/$_.\$(SHLIBEXT)\n");
 -                      $self->output("\t\@ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$_.\$(SHLIBEXT)\n");
 -              }
 +              $self->output("\$(eval \$(foreach alias,". join(' ', @{$ctx->{ALIASES}}) . ",\$(call shared_module_alias_template,$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME},$sane_subsystem,\$(alias))))\n");
        }
 -      $self->output("\n");
  }
  
+ sub StaticLibraryPrimitives($$)
+ {
+       my ($self,$ctx) = @_;
+  
+       $self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
+       $self->_prepare_list($ctx, "FULL_OBJ_LIST");
+ }
  sub SharedLibraryPrimitives($$)
  {
        my ($self,$ctx) = @_;
@@@ -4,7 -4,7 +4,11 @@@
  SUBSYSTEM = LIBLDB
  OUTPUT_TYPE = SHARED_LIBRARY
  PRIVATE_DEPENDENCIES = LIBTALLOC LIBNDR NDR_MISC
++<<<<<<< HEAD:source/dsdb/samdb/ldb_modules/config.mk
 +INIT_FUNCTION = LDB_MODULE(objectguid)
++=======
+ INIT_FUNCTION = objectguid_module_module_ops
++>>>>>>> 5f3a70f285ad8a412105c0e498e486f93fc279bc:source/dsdb/samdb/ldb_modules/config.mk
  # End MODULE ldb_objectguid
  ################################################
  
@@@ -77,7 -82,8 +86,8 @@@ ldb_pdc_fsmo_OBJ_FILES = 
  SUBSYSTEM = LIBLDB
  OUTPUT_TYPE = SHARED_LIBRARY
  PRIVATE_DEPENDENCIES = LIBTALLOC LDAP_ENCODE NDR_MISC SAMDB
 -INIT_FUNCTION = samldb_module_module_ops
 +INIT_FUNCTION = LDB_MODULE(samldb)
+ #
  # End MODULE ldb_samldb
  ################################################
  
Simple merge
Simple merge
@@@ -588,7 -589,8 +589,7 @@@ PC_FILES += librpc/dcerpc.p
  dcerpc_VERSION = 0.0.1
  dcerpc_SOVERSION = 0
  
--dcerpc_OBJ_FILES = $(addprefix librpc/rpc/, dcerpc.o dcerpc_auth.o dcerpc_schannel.o dcerpc_util.o \
 -                                 binding.o \
++dcerpc_OBJ_FILES = $(addprefix librpc/rpc/, dcerpc.o dcerpc_auth.o dcerpc_schannel.o dcerpc_util.o binding.o \
                                  dcerpc_error.o dcerpc_smb.o dcerpc_smb2.o dcerpc_sock.o dcerpc_connect.o dcerpc_secondary.o)
  
  
@@@ -751,40 -755,41 +754,49 @@@ PRIVATE_DEPENDENCIES = dcerpc_atsvc PYT
  python_atsvc_OBJ_FILES = librpc/gen_ndr/py_atsvc.o
  
  [PYTHON::python_samr]
- PRIVATE_DEPENDENCIES = dcerpc_samr
+ PRIVATE_DEPENDENCIES = dcerpc_samr PYTALLOC
+ python_samr_OBJ_FILES = librpc/gen_ndr/py_samr.o
  
 +python_samr_OBJ_FILES = librpc/gen_ndr/py_samr.o
 +
  [PYTHON::python_svcctl]
- PRIVATE_DEPENDENCIES = RPC_NDR_SVCCTL
+ PRIVATE_DEPENDENCIES = RPC_NDR_SVCCTL PYTALLOC
  
  python_svcctl_OBJ_FILES = librpc/gen_ndr/py_svcctl.o
  
  [PYTHON::python_lsa]
- PRIVATE_DEPENDENCIES = RPC_NDR_LSA
+ PRIVATE_DEPENDENCIES = RPC_NDR_LSA PYTALLOC
+ python_lsa_OBJ_FILES = librpc/gen_ndr/py_lsa.o
  
 +python_lsa_OBJ_FILES = librpc/gen_ndr/py_lsa.o
 +
  [PYTHON::python_wkssvc]
- PRIVATE_DEPENDENCIES = RPC_NDR_WKSSVC
+ PRIVATE_DEPENDENCIES = RPC_NDR_WKSSVC PYTALLOC
  
  python_wkssvc_OBJ_FILES = librpc/gen_ndr/py_wkssvc.o
  
  [PYTHON::python_dfs]
- PRIVATE_DEPENDENCIES = RPC_NDR_DFS
+ PRIVATE_DEPENDENCIES = RPC_NDR_DFS PYTALLOC
+ python_dfs_OBJ_FILES = librpc/gen_ndr/py_dfs.o
  
 +python_dfs_OBJ_FILES = gen_ndr/py_dfs.o
 +
  [PYTHON::python_unixinfo]
- PRIVATE_DEPENDENCIES = RPC_NDR_UNIXINFO
+ PRIVATE_DEPENDENCIES = RPC_NDR_UNIXINFO PYTALLOC
  
- python_unixinfo_OBJ_FILES = gen_ndr/py_unixinfo.o
+ python_unixinfo_OBJ_FILES = librpc/gen_ndr/py_unixinfo.o
  
  [PYTHON::python_drsuapi]
- PRIVATE_DEPENDENCIES = RPC_NDR_DRSUAPI
+ PRIVATE_DEPENDENCIES = RPC_NDR_DRSUAPI PYTALLOC
+ python_drsuapi_OBJ_FILES = librpc/gen_ndr/py_drsuapi.o
  
 +python_drsuapi_OBJ_FILES = gen_ndr/py_drsuapi.o
 +
  [PYTHON::python_dcerpc_security]
+ PRIVATE_DEPENDENCIES = PYTALLOC
  
  python_dcerpc_security_OBJ_FILES = librpc/gen_ndr/py_security.o
Simple merge
Simple merge
@@@ -1,16 -1,15 +1,21 @@@
  [LIBRARY::LIBSAMBA-HOSTCONFIG]
- VERSION = 0.0.1
- SO_VERSION = 1
  PUBLIC_DEPENDENCIES = LIBSAMBA-UTIL 
  PRIVATE_DEPENDENCIES = DYNCONFIG LIBREPLACE_EXT CHARSET
- PRIVATE_PROTO_HEADER = proto.h
+ LIBSAMBA-HOSTCONFIG_VERSION = 0.0.1
+ LIBSAMBA-HOSTCONFIG-SOVERSION = 0
+ LIBSAMBA-HOSTCONFIG_OBJ_FILES = param/loadparm.o \
+                       param/generic.o \
+                       param/util.o \
+                       lib/version.o
  
 +LIBSAMBA-CONFIG_OBJ_FILES = param/loadparm.o \
 +                      param/params.o \
 +                      param/generic.o \
 +                      param/util.o \
 +                      lib/version.o
 +
  PUBLIC_HEADERS += param/param.h
  
  PC_FILES += param/samba-hostconfig.pc
Simple merge
Simple merge
@@@ -58,10 -58,10 +58,12 @@@ smbcalls_data_OBJ_FILES = scripting/ejs
  OUTPUT_TYPE = MERGED_OBJ
  SUBSYSTEM = smbcalls
  INIT_FUNCTION = smb_setup_ejs_auth
 -PRIVATE_DEPENDENCIES = auth
 +PRIVATE_DEPENDENCIES = service_auth
 +
 +smbcalls_auth_OBJ_FILES = scripting/ejs/smbcalls_auth.o
  
+ smbcalls_auth_OBJ_FILES = scripting/ejs/smbcalls_auth.o
  [MODULE::smbcalls_string]
  SUBSYSTEM = smbcalls
  OUTPUT_TYPE = MERGED_OBJ
@@@ -20,6 -20,10 +20,12 @@@ SWIG_FILE = misc.
  
  python_misc_OBJ_FILES = scripting/python/misc_wrap.o
  
 -PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py bin/python/registry.py bin/python/tdb.py bin/python/security.py bin/python/events.py bin/python/net.py
 +_PY_FILES = $(shell find scripting/python -name "*.py")
 +
 +$(foreach pyfile, $(_PY_FILES),$(eval $(call python_py_module_template,$(patsubst scripting/python/%,%,$(pyfile)),$(pyfile))))
+ installpython:: pythonmods
+       @$(SHELL) $(srcdir)/script/installpython.sh \
+               $(INSTALLPERMS) \
+               $(DESTDIR)$(PYTHONDIR) \
+               scripting/python bin/python
Simple merge
Simple merge