[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha2-738-ge779cf4
Jelmer Vernooij
jelmer at samba.org
Mon Feb 11 14:19:45 GMT 2008
The branch, v4-0-test has been updated
via e779cf4724610b5d737102d1f55d1367744b188a (commit)
via de7af6913487b51e44463bf1908e765477d28e5d (commit)
via a5db115dc6827896c66fe08554b3fe7185eea52f (commit)
via ebf6e59dfef30e1f679ea6692385a09abcb220dd (commit)
from 1c14c457bea75fb3055712547cca501e8ef3fc20 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit e779cf4724610b5d737102d1f55d1367744b188a
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 11 14:53:28 2008 +0100
Remove unused function.
commit de7af6913487b51e44463bf1908e765477d28e5d
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 11 14:48:39 2008 +0100
Move pidl bits to a separate file.
commit a5db115dc6827896c66fe08554b3fe7185eea52f
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 11 12:39:47 2008 +0100
Fix typo.
commit ebf6e59dfef30e1f679ea6692385a09abcb220dd
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 11 01:42:29 2008 +0100
Avoid autogenerating the Makefile but rather include a data.mk file
that is autogenerated.
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 3 +-
source/{main.mk => Makefile} | 84 +++------------
source/build/smb_build/config_mk.pm | 2 -
source/build/smb_build/main.pl | 2 +-
source/build/smb_build/makefile.pm | 4 -
source/lib/samba3/smbpasswd.c | 139 ------------------------
source/lib/util/fault.c | 2 +-
source/main.mk | 202 -----------------------------------
source/pidl/config.mk | 36 ++++++
source/rules.mk | 1 -
10 files changed, 54 insertions(+), 421 deletions(-)
copy source/{main.mk => Makefile} (72%)
create mode 100644 source/pidl/config.mk
Changeset truncated at 500 lines:
diff --git a/.gitignore b/.gitignore
index 948ba83..e51be50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,6 @@ autom4te.cache
*.hd
*.ho
*.pyc
-Makefile
configure
source/bin/*
config.log
@@ -196,3 +195,5 @@ source/libcli/ldap/ldap_ndr.h
source/libcli/resolve/lp_proto.h
source/apidocs
*.swp
+source/mkconfig.mk
+source/data.mk
diff --git a/source/main.mk b/source/Makefile
similarity index 72%
copy from source/main.mk
copy to source/Makefile
index f7ef4b4..e734b01 100644
--- a/source/main.mk
+++ b/source/Makefile
@@ -1,3 +1,9 @@
+#!gmake
+# The Samba 4 Makefile.
+# This file is *NOT* autogenerated.
+
+include mkconfig.mk
+
VPATH = $(builddir):$(srcdir):heimdal_build:heimdal/lib/asn1:heimdal/lib/krb5:heimdal/lib/gssapi:heimdal/lib/hdb:heimdal/lib/roken:heimdal/lib/des
BASEDIR = $(prefix)
@@ -15,37 +21,7 @@ HOSTLD_FLAGS = $(LDFLAGS)
default: all
-include dynconfig.mk
-include heimdal_build/config.mk
-include config.mk
-include dsdb/config.mk
-include smbd/config.mk
-include cluster/config.mk
-include smbd/process_model.mk
-include libnet/config.mk
-include auth/config.mk
-include nsswitch/config.mk
-include lib/basic.mk
-include param/config.mk
-include smb_server/config.mk
-include rpc_server/config.mk
-include ldap_server/config.mk
-include web_server/config.mk
-include winbind/config.mk
-include nbt_server/config.mk
-include wrepl_server/config.mk
-include cldap_server/config.mk
-include utils/net/config.mk
-include utils/config.mk
-include ntvfs/config.mk
-include ntptr/config.mk
-include torture/config.mk
-include librpc/config.mk
-include client/config.mk
-include libcli/config.mk
-include scripting/ejs/config.mk
-include scripting/python/config.mk
-include kdc/config.mk
+include data.mk
DEFAULT_HEADERS = $(srcdir)/lib/util/dlinklist.h \
$(srcdir)/version.h
@@ -94,8 +70,8 @@ showflags::
# The permissions to give the executables
INSTALLPERMS = 0755
-install:: showlayout everything installbin installdat installswat installmisc installlib \
- installheader installpc installplugins
+install:: showlayout everything installbin installdat installswat installmisc \
+ installlib installheader installpc installplugins
# DESTDIR is used here to prevent packagers wasting their time
# duplicating the Makefile. Remove it and you will have the privilege
@@ -188,46 +164,14 @@ uninstallheader::
uninstallman::
@$(SHELL) $(srcdir)/script/uninstallman.sh $(DESTDIR)$(mandir) $(MANPAGES)
-Makefile: config.status $(MK_FILES)
+data.mk: config.status $(MK_FILES)
./config.status
-pidl/Makefile: pidl/Makefile.PL
- cd pidl && $(PERL) Makefile.PL
-
-testcov-html:: pidl-testcov
-
-pidl-testcov: pidl/Makefile
- cd pidl && cover -test
-
-installpidl:: pidl/Makefile
- $(MAKE) -C pidl install
-
-uninstallpidl:: pidl/Makefile
- $(MAKE) -C pidl uninstall
-
-$(IDL_HEADER_FILES) \
- $(IDL_NDR_PARSE_H_FILES) $(IDL_NDR_PARSE_C_FILES) \
- $(IDL_NDR_CLIENT_C_FILES) $(IDL_NDR_CLIENT_H_FILES) \
- $(IDL_NDR_SERVER_C_FILES) $(IDL_SWIG_FILES) \
- $(IDL_NDR_EJS_C_FILES) $(IDL_NDR_EJS_H_FILES) \
- $(IDL_NDR_PY_C_FILES) $(IDL_NDR_PY_H_FILES): idl
-
-idl_full:: pidl/lib/Parse/Pidl/IDL.pm pidl/lib/Parse/Pidl/Expr.pm
- @CPP="$(CPP)" PERL="$(PERL)" srcdir=$(srcdir) $(srcdir)/script/build_idl.sh FULL
-
-idl:: pidl/lib/Parse/Pidl/IDL.pm pidl/lib/Parse/Pidl/Expr.pm
- @CPP="$(CPP)" PERL="$(PERL)" srcdir=$(srcdir) $(srcdir)/script/build_idl.sh PARTIAL
-
-pidl/lib/Parse/Pidl/IDL.pm: pidl/idl.yp
- -$(YAPP) -m 'Parse::Pidl::IDL' -o pidl/lib/Parse/Pidl/IDL.pm pidl/idl.yp ||\
- touch pidl/lib/Parse/Pidl/IDL.pm
-
-pidl/lib/Parse/Pidl/Expr.pm: pidl/idl.yp
- -$(YAPP) -m 'Parse::Pidl::Expr' -o pidl/lib/Parse/Pidl/Expr.pm pidl/expr.yp ||\
- touch pidl/lib/Parse/Pidl/Expr.pm
+testcov-html::
-mkinclude selftest/config.mk
-mkinclude rules.mk
+include pidl/config.mk
+include selftest/config.mk
+include rules.mk
showflags::
@echo ' pwd = '`/bin/pwd`
diff --git a/source/build/smb_build/config_mk.pm b/source/build/smb_build/config_mk.pm
index b7dc969..aa07549 100644
--- a/source/build/smb_build/config_mk.pm
+++ b/source/build/smb_build/config_mk.pm
@@ -251,8 +251,6 @@ sub run_config_mk($$$$)
next;
}
- $line =~ s/^mkinclude /include /;
-
# empty line
if ($line =~ /^[ \t]*$/) {
$section = "GLOBAL";
diff --git a/source/build/smb_build/main.pl b/source/build/smb_build/main.pl
index fb76910..ff54021 100644
--- a/source/build/smb_build/main.pl
+++ b/source/build/smb_build/main.pl
@@ -80,7 +80,7 @@ foreach my $key (values %$OUTPUT) {
defined($key->{PUBLIC_PROTO_HEADER});
}
-$mkenv->write("Makefile");
+$mkenv->write("data.mk");
header::create_smb_build_h($OUTPUT, "include/build.h");
cflags::create_cflags($OUTPUT, $config::config{srcdir},
diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index 865d231..0393e2b 100644
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -41,14 +41,10 @@ sub new($$$)
$self->{mkfile} = $mkfile;
- $self->output("#!gmake\n");
$self->output("################################################\n");
$self->output("# Autogenerated by build/smb_build/makefile.pm #\n");
$self->output("################################################\n");
$self->output("\n");
- $self->output("include mkconfig.mk\n");
-
- $self->output("default: all\n\n");
$self->_prepare_compiler_linker();
diff --git a/source/lib/samba3/smbpasswd.c b/source/lib/samba3/smbpasswd.c
index 39e2448..47c826f 100644
--- a/source/lib/samba3/smbpasswd.c
+++ b/source/lib/samba3/smbpasswd.c
@@ -204,142 +204,3 @@ char *smbpasswd_encode_acb_info(TALLOC_CTX *mem_ctx, uint16_t acb_info)
return acct_str;
}
-
-NTSTATUS samba3_read_smbpasswd(const char *filename, TALLOC_CTX *ctx, struct samba3_samaccount **accounts, uint32_t *count)
-{
- int numlines;
- char **lines;
- int i;
-
- *count = 0;
- *accounts = NULL;
-
- lines = file_lines_load(filename, &numlines, ctx);
-
- if (lines == NULL) {
- DEBUG(0, ("Unable to load lines from %s\n", filename));
- return NT_STATUS_UNSUCCESSFUL;
- }
-
- *accounts = talloc_array(ctx, struct samba3_samaccount, numlines);
-
- for (i = 0; i < numlines; i++) {
- char *p = lines[i], *q;
- uid_t uid;
- struct samba3_samaccount *acc = &((*accounts)[*count]);
-
- if (p[0] == '\0' || p[0] == '#')
- continue;
-
- ZERO_STRUCTP(acc);
-
- q = strchr(p, ':');
- if (!q) {
- DEBUG(0, ("%s:%d: expected ':'\n", filename, i));
- continue;
- }
-
- acc->username = talloc_strndup(ctx, p, PTR_DIFF(q, p));
- p = q+1;
-
- uid = atoi(p);
-
- /* uid is ignored here.. */
-
- q = strchr(p, ':');
- if (!q) {
- DEBUG(0, ("%s:%d: expected ':'\n", filename, i));
- continue;
- }
- p = q+1;
-
- if (strlen(p) < 33) {
- DEBUG(0, ("%s:%d: expected 32 byte password blob\n", filename, i));
- continue;
- }
-
- if (!strncmp(p, "NO PASSWORD", strlen("NO PASSWORD"))) {
- acc->acct_ctrl |= ACB_PWNOTREQ;
- } else if (p[0] == '*' || p[0] == 'X') {
- /* No password set */
- } else {
- struct samr_Password *pw = smbpasswd_gethexpwd(*accounts, p);
-
- if (!pw) {
- DEBUG(0, ("%s:%d: Malformed LM pw entry\n", filename, i));
- continue;
- }
-
- memcpy(acc->lm_pw.hash, pw, sizeof(*pw));
- }
-
- if (p[32] != ':') {
- DEBUG(0, ("%s:%d: expected ':' after 32 byte password blob\n", filename, i));
- continue;
- }
-
- p += 33;
-
- if (p[0] == '*' || p[0] == 'X') {
- /* No password set */
- } else {
- struct samr_Password *pw = smbpasswd_gethexpwd(*accounts, p);
-
- if (!pw) {
- DEBUG(0, ("%s:%d: Malformed LM pw entry\n", filename, i));
- continue;
- }
-
- memcpy(acc->nt_pw.hash, pw, sizeof(*pw));
- }
-
- if (p[32] != ':') {
- DEBUG(0, ("%s:%d: expected ':' after 32 byte password blob\n", filename, i));
- continue;
- }
-
- p += 33;
-
- if (p[0] == '[') {
- q = strchr(p, ']');
- if (!q) {
- DEBUG(0, ("%s:%d: expected ']'\n", filename, i));
- continue;
- }
-
- acc->acct_ctrl |= smbpasswd_decode_acb_info(p);
-
- p = q+1;
- if (p[0] == ':' && strncmp(p, "LCT-", 4) == 0) {
- int j;
- p += 4;
-
- for(j = 0; j < 8; j++) {
- if(p[j] == '\0' || !isxdigit(p[j])) {
- break;
- }
- }
- if(i == 8) {
- acc->pass_last_set_time = (time_t)strtol((char *)p, NULL, 16);
- }
- }
- } else {
- /* 'Old' style file. Fake up based on user name. */
- /*
- * Currently trust accounts are kept in the same
- * password file as 'normal accounts'. If this changes
- * we will have to fix this code. JRA.
- */
- if(acc->username[strlen(acc->username) - 1] == '$') {
- acc->acct_ctrl &= ~ACB_NORMAL;
- acc->acct_ctrl |= ACB_WSTRUST;
- }
- }
-
- (*count)++;
- }
-
- talloc_free(lines);
-
- return NT_STATUS_OK;
-}
diff --git a/source/lib/util/fault.c b/source/lib/util/fault.c
index cd347a5..cb51cbd 100644
--- a/source/lib/util/fault.c
+++ b/source/lib/util/fault.c
@@ -178,7 +178,7 @@ _NORETURN_ static void sig_fault(int sig)
/* we have a fault handler, call it. It may not return. */
fault_handlers.fault_handler(sig);
}
- /* If it returns or doean't exist, use regular reporter */
+ /* If it returns or doesn't exist, use regular reporter */
fault_report(sig);
}
diff --git a/source/main.mk b/source/main.mk
index f7ef4b4..beba4d2 100644
--- a/source/main.mk
+++ b/source/main.mk
@@ -1,20 +1,3 @@
-VPATH = $(builddir):$(srcdir):heimdal_build:heimdal/lib/asn1:heimdal/lib/krb5:heimdal/lib/gssapi:heimdal/lib/hdb:heimdal/lib/roken:heimdal/lib/des
-
-BASEDIR = $(prefix)
-TORTUREDIR = $(libdir)/torture
-SWATDIR = $(datadir)/swat
-JSDIR = $(datadir)/js
-SETUPDIR = $(datadir)/setup
-NCALRPCDIR = $(localstatedir)/ncalrpc
-
-BNLD = $(LD)
-BNLD_FLAGS = $(LDFLAGS)
-
-HOSTCC_FLAGS = -D_SAMBA_HOSTCC_ $(CFLAGS)
-HOSTLD_FLAGS = $(LDFLAGS)
-
-default: all
-
include dynconfig.mk
include heimdal_build/config.mk
include config.mk
@@ -46,188 +29,3 @@ include libcli/config.mk
include scripting/ejs/config.mk
include scripting/python/config.mk
include kdc/config.mk
-
-DEFAULT_HEADERS = $(srcdir)/lib/util/dlinklist.h \
- $(srcdir)/version.h
-
-binaries:: $(BINARIES)
-libraries:: $(STATIC_LIBS) $(SHARED_LIBS)
-modules:: $(SHARED_MODULES)
-headers:: $(PUBLIC_HEADERS) $(DEFAULT_HEADERS)
-manpages:: $(MANPAGES)
-all:: showflags $(ALL_PREDEP) bin/asn1_compile bin/compile_et binaries modules pythonmods
-everything:: all libraries headers
-
-LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)=$(builddir)/bin/shared
-
-# 'make testsuite' creates all binaries which are
-# needed by samba3's 'make test' and the build-farm
-# scripts use that it as fallback in case
-# 'make everything' fails
-testsuite:: bin/smbclient bin/cifsdd bin/smbtorture bin/nmblookup
-
-showlayout::
- @echo 'Samba will be installed into:'
- @echo ' basedir: $(BASEDIR)'
- @echo ' bindir: $(bindir)'
- @echo ' sbindir: $(sbindir)'
- @echo ' libdir: $(libdir)'
- @echo ' modulesdir: $(modulesdir)'
- @echo ' includedir: $(includedir)'
- @echo ' vardir: $(localstatedir)'
- @echo ' privatedir: $(privatedir)'
- @echo ' piddir: $(piddir)'
- @echo ' lockdir: $(lockdir)'
- @echo ' logfilebase: $(logfilebase)'
- @echo ' setupdir: $(SETUPDIR)'
- @echo ' jsdir: $(JSDIR)'
- @echo ' swatdir: $(SWATDIR)'
- @echo ' mandir: $(mandir)'
- @echo ' torturedir: $(TORTUREDIR)'
- @echo ' datadir: $(datadir)'
- @echo ' winbindd_socket_dir: $(winbindd_socket_dir)'
-
-showflags::
- @echo ' srcdir = $(srcdir)'
- @echo ' builddir = $(builddir)'
-
-# The permissions to give the executables
-INSTALLPERMS = 0755
-
-install:: showlayout everything installbin installdat installswat installmisc installlib \
- installheader installpc installplugins
-
-# DESTDIR is used here to prevent packagers wasting their time
-# duplicating the Makefile. Remove it and you will have the privilege
-# of packaging each samba release for multiple versions of multiple
-# distributions and operating systems, or at least supplying patches
-# to all the packaging files required for this, prior to committing
-# the removal of DESTDIR. Do not remove it even though you think it
-# is not used.
-
-installdirs::
- @$(SHELL) $(srcdir)/script/installdirs.sh \
- $(DESTDIR)$(BASEDIR) \
- $(DESTDIR)$(bindir) \
- $(DESTDIR)$(sbindir) \
- $(DESTDIR)$(TORTUREDIR) \
- $(DESTDIR)$(libdir) \
- $(DESTDIR)$(modulesdir) \
- $(DESTDIR)$(mandir) \
- $(DESTDIR)$(localstatedir) \
- $(DESTDIR)$(privatedir) \
- $(DESTDIR)$(datadir) \
- $(DESTDIR)$(piddir) \
- $(DESTDIR)$(lockdir) \
- $(DESTDIR)$(logfilebase) \
- $(DESTDIR)$(privatedir)/tls \
- $(DESTDIR)$(includedir) \
- $(DESTDIR)$(PKGCONFIGDIR) \
- $(DESTDIR)$(sysconfdir) \
-
-installbin:: $(SBIN_PROGS) $(BIN_PROGS) $(TORTURE_PROGS) installdirs
- @$(SHELL) $(srcdir)/script/installbin.sh \
- $(INSTALLPERMS) \
- $(DESTDIR)$(BASEDIR) \
- $(DESTDIR)$(sbindir) \
- $(DESTDIR)$(libdir) \
- $(DESTDIR)$(localstatedir) \
- $(SBIN_PROGS)
- @$(SHELL) $(srcdir)/script/installbin.sh \
- $(INSTALLPERMS) \
- $(DESTDIR)$(BASEDIR) \
- $(DESTDIR)$(bindir) \
- $(DESTDIR)$(libdir) \
- $(DESTDIR)$(localstatedir) \
- $(BIN_PROGS)
- @$(SHELL) $(srcdir)/script/installtorture.sh \
- $(INSTALLPERMS) \
- $(DESTDIR)$(TORTUREDIR) \
- $(TORTURE_PROGS)
-
-installlib:: $(INSTALLABLE_SHARED_LIBS) $(STATIC_LIBS) installdirs
- @$(SHELL) $(srcdir)/script/installlib.sh $(DESTDIR)$(libdir) "$(SHLIBEXT)" $(INSTALLABLE_SHARED_LIBS)
- #@$(SHELL) $(srcdir)/script/installlib.sh $(DESTDIR)$(libdir) "$(STLIBEXT)" $(STATIC_LIBS)
-
-installheader:: headers installdirs
- @srcdir=$(srcdir) builddir=$(builddir) $(PERL) $(srcdir)/script/installheader.pl $(DESTDIR)$(includedir) $(PUBLIC_HEADERS) $(DEFAULT_HEADERS)
-
-installdat:: installdirs
- @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR)$(datadir) $(srcdir)
-
-installswat:: installdirs
- @$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR)$(SWATDIR) $(srcdir)
-
-installman:: manpages installdirs
- @$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(mandir) $(MANPAGES)
-
-installmisc:: installdirs
- @$(SHELL) $(srcdir)/script/installmisc.sh $(srcdir) $(DESTDIR)$(JSDIR) $(DESTDIR)$(SETUPDIR) $(DESTDIR)$(bindir)
-
-installpc:: installdirs
- @$(SHELL) $(srcdir)/script/installpc.sh $(builddir) $(DESTDIR)$(PKGCONFIGDIR) $(PC_FILES)
-
-uninstall:: uninstallbin uninstallman uninstallmisc uninstalllib uninstallheader \
- uninstallplugins
-
-uninstallmisc::
- #FIXME
-
-uninstallbin::
- @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(sbindir) $(DESTDIR)$(libdir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(SBIN_PROGS)
--
Samba Shared Repository
More information about the samba-cvs
mailing list