mirror of
https://github.com/samba-team/samba.git
synced 2024-12-23 17:34:34 +03:00
Sync with HEAD
This commit is contained in:
Jelmer Vernooij
parent
eac350e09f
commit
1a25dc776d
359
source/aclocal.m4
vendored
359
source/aclocal.m4
vendored
@ -103,3 +103,362 @@ else
|
||||
ac_cv_prog_gnu_ld=no
|
||||
fi])
|
||||
])
|
||||
|
||||
# Configure paths for LIBXML2
|
||||
# Toshio Kuratomi 2001-04-21
|
||||
# Adapted from:
|
||||
# Configure paths for GLIB
|
||||
# Owen Taylor 97-11-3
|
||||
|
||||
dnl AM_PATH_XML2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
|
||||
dnl Test for XML, and define XML_CFLAGS and XML_LIBS
|
||||
dnl
|
||||
AC_DEFUN(AM_PATH_XML2,[
|
||||
AC_ARG_WITH(xml-prefix,
|
||||
[ --with-xml-prefix=PFX Prefix where libxml is installed (optional)],
|
||||
xml_config_prefix="$withval", xml_config_prefix="")
|
||||
AC_ARG_WITH(xml-exec-prefix,
|
||||
[ --with-xml-exec-prefix=PFX Exec prefix where libxml is installed (optional)],
|
||||
xml_config_exec_prefix="$withval", xml_config_exec_prefix="")
|
||||
AC_ARG_ENABLE(xmltest,
|
||||
[ --disable-xmltest Do not try to compile and run a test LIBXML program],,
|
||||
enable_xmltest=yes)
|
||||
|
||||
if test x$xml_config_exec_prefix != x ; then
|
||||
xml_config_args="$xml_config_args --exec-prefix=$xml_config_exec_prefix"
|
||||
if test x${XML2_CONFIG+set} != xset ; then
|
||||
XML2_CONFIG=$xml_config_exec_prefix/bin/xml2-config
|
||||
fi
|
||||
fi
|
||||
if test x$xml_config_prefix != x ; then
|
||||
xml_config_args="$xml_config_args --prefix=$xml_config_prefix"
|
||||
if test x${XML2_CONFIG+set} != xset ; then
|
||||
XML2_CONFIG=$xml_config_prefix/bin/xml2-config
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_PATH_PROG(XML2_CONFIG, xml2-config, no)
|
||||
min_xml_version=ifelse([$1], ,2.0.0,[$1])
|
||||
AC_MSG_CHECKING(for libxml - version >= $min_xml_version)
|
||||
no_xml=""
|
||||
if test "$XML2_CONFIG" = "no" ; then
|
||||
no_xml=yes
|
||||
else
|
||||
XML_CFLAGS=`$XML2_CONFIG $xml_config_args --cflags`
|
||||
XML_LIBS=`$XML2_CONFIG $xml_config_args --libs`
|
||||
xml_config_major_version=`$XML2_CONFIG $xml_config_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
||||
xml_config_minor_version=`$XML2_CONFIG $xml_config_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
||||
xml_config_micro_version=`$XML2_CONFIG $xml_config_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
||||
if test "x$enable_xmltest" = "xyes" ; then
|
||||
ac_save_CFLAGS="$CFLAGS"
|
||||
ac_save_LIBS="$LIBS"
|
||||
CFLAGS="$CFLAGS $XML_CFLAGS"
|
||||
LIBS="$XML_LIBS $LIBS"
|
||||
dnl
|
||||
dnl Now check if the installed libxml is sufficiently new.
|
||||
dnl (Also sanity checks the results of xml2-config to some extent)
|
||||
dnl
|
||||
rm -f conf.xmltest
|
||||
AC_TRY_RUN([
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <libxml/xmlversion.h>
|
||||
|
||||
int
|
||||
main()
|
||||
{
|
||||
int xml_major_version, xml_minor_version, xml_micro_version;
|
||||
int major, minor, micro;
|
||||
char *tmp_version;
|
||||
|
||||
system("touch conf.xmltest");
|
||||
|
||||
/* Capture xml2-config output via autoconf/configure variables */
|
||||
/* HP/UX 9 (%@#!) writes to sscanf strings */
|
||||
tmp_version = (char *)strdup("$min_xml_version");
|
||||
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
|
||||
printf("%s, bad version string from xml2-config\n", "$min_xml_version");
|
||||
exit(1);
|
||||
}
|
||||
free(tmp_version);
|
||||
|
||||
/* Capture the version information from the header files */
|
||||
tmp_version = (char *)strdup(LIBXML_DOTTED_VERSION);
|
||||
if (sscanf(tmp_version, "%d.%d.%d", &xml_major_version, &xml_minor_version, &xml_micro_version) != 3) {
|
||||
printf("%s, bad version string from libxml includes\n", "LIBXML_DOTTED_VERSION");
|
||||
exit(1);
|
||||
}
|
||||
free(tmp_version);
|
||||
|
||||
/* Compare xml2-config output to the libxml headers */
|
||||
if ((xml_major_version != $xml_config_major_version) ||
|
||||
(xml_minor_version != $xml_config_minor_version) ||
|
||||
(xml_micro_version != $xml_config_micro_version))
|
||||
{
|
||||
printf("*** libxml header files (version %d.%d.%d) do not match\n",
|
||||
xml_major_version, xml_minor_version, xml_micro_version);
|
||||
printf("*** xml2-config (version %d.%d.%d)\n",
|
||||
$xml_config_major_version, $xml_config_minor_version, $xml_config_micro_version);
|
||||
return 1;
|
||||
}
|
||||
/* Compare the headers to the library to make sure we match */
|
||||
/* Less than ideal -- doesn't provide us with return value feedback,
|
||||
* only exits if there's a serious mismatch between header and library.
|
||||
*/
|
||||
LIBXML_TEST_VERSION;
|
||||
|
||||
/* Test that the library is greater than our minimum version */
|
||||
if ((xml_major_version > major) ||
|
||||
((xml_major_version == major) && (xml_minor_version > minor)) ||
|
||||
((xml_major_version == major) && (xml_minor_version == minor) &&
|
||||
(xml_micro_version >= micro)))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
printf("\n*** An old version of libxml (%d.%d.%d) was found.\n",
|
||||
xml_major_version, xml_minor_version, xml_micro_version);
|
||||
printf("*** You need a version of libxml newer than %d.%d.%d. The latest version of\n",
|
||||
major, minor, micro);
|
||||
printf("*** libxml is always available from ftp://ftp.xmlsoft.org.\n");
|
||||
printf("***\n");
|
||||
printf("*** If you have already installed a sufficiently new version, this error\n");
|
||||
printf("*** probably means that the wrong copy of the xml2-config shell script is\n");
|
||||
printf("*** being found. The easiest way to fix this is to remove the old version\n");
|
||||
printf("*** of LIBXML, but you can also set the XML2_CONFIG environment to point to the\n");
|
||||
printf("*** correct copy of xml2-config. (In this case, you will have to\n");
|
||||
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
|
||||
printf("*** so that the correct libraries are found at run-time))\n");
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
],, no_xml=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x$no_xml" = x ; then
|
||||
AC_MSG_RESULT(yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version))
|
||||
ifelse([$2], , :, [$2])
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
if test "$XML2_CONFIG" = "no" ; then
|
||||
echo "*** The xml2-config script installed by LIBXML could not be found"
|
||||
echo "*** If libxml was installed in PREFIX, make sure PREFIX/bin is in"
|
||||
echo "*** your path, or set the XML2_CONFIG environment variable to the"
|
||||
echo "*** full path to xml2-config."
|
||||
else
|
||||
if test -f conf.xmltest ; then
|
||||
:
|
||||
else
|
||||
echo "*** Could not run libxml test program, checking why..."
|
||||
CFLAGS="$CFLAGS $XML_CFLAGS"
|
||||
LIBS="$LIBS $XML_LIBS"
|
||||
AC_TRY_LINK([
|
||||
#include <libxml/xmlversion.h>
|
||||
#include <stdio.h>
|
||||
], [ LIBXML_TEST_VERSION; return 0;],
|
||||
[ echo "*** The test program compiled, but did not run. This usually means"
|
||||
echo "*** that the run-time linker is not finding LIBXML or finding the wrong"
|
||||
echo "*** version of LIBXML. If it is not finding LIBXML, you'll need to set your"
|
||||
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
|
||||
echo "*** to the installed location Also, make sure you have run ldconfig if that"
|
||||
echo "*** is required on your system"
|
||||
echo "***"
|
||||
echo "*** If you have an old version installed, it is best to remove it, although"
|
||||
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
|
||||
[ echo "*** The test program failed to compile or link. See the file config.log for the"
|
||||
echo "*** exact error that occured. This usually means LIBXML was incorrectly installed"
|
||||
echo "*** or that you have moved LIBXML since it was installed. In the latter case, you"
|
||||
echo "*** may want to edit the xml2-config script: $XML2_CONFIG" ])
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
fi
|
||||
|
||||
XML_CFLAGS=""
|
||||
XML_LIBS=""
|
||||
ifelse([$3], , :, [$3])
|
||||
fi
|
||||
AC_SUBST(XML_CFLAGS)
|
||||
AC_SUBST(XML_LIBS)
|
||||
rm -f conf.xmltest
|
||||
])
|
||||
|
||||
# =========================================================================
|
||||
# AM_PATH_MYSQL : MySQL library
|
||||
|
||||
dnl AM_PATH_MYSQL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
|
||||
dnl Test for MYSQL, and define MYSQL_CFLAGS and MYSQL_LIBS
|
||||
dnl
|
||||
AC_DEFUN(AM_PATH_MYSQL,
|
||||
[dnl
|
||||
dnl Get the cflags and libraries from the mysql_config script
|
||||
dnl
|
||||
AC_ARG_WITH(mysql-prefix,[ --with-mysql-prefix=PFX Prefix where MYSQL is installed (optional)],
|
||||
mysql_prefix="$withval", mysql_prefix="")
|
||||
AC_ARG_WITH(mysql-exec-prefix,[ --with-mysql-exec-prefix=PFX Exec prefix where MYSQL is installed (optional)],
|
||||
mysql_exec_prefix="$withval", mysql_exec_prefix="")
|
||||
AC_ARG_ENABLE(mysqltest, [ --disable-mysqltest Do not try to compile and run a test MYSQL program],
|
||||
, enable_mysqltest=yes)
|
||||
|
||||
if test x$mysql_exec_prefix != x ; then
|
||||
mysql_args="$mysql_args --exec-prefix=$mysql_exec_prefix"
|
||||
if test x${MYSQL_CONFIG+set} != xset ; then
|
||||
MYSQL_CONFIG=$mysql_exec_prefix/bin/mysql_config
|
||||
fi
|
||||
fi
|
||||
if test x$mysql_prefix != x ; then
|
||||
mysql_args="$mysql_args --prefix=$mysql_prefix"
|
||||
if test x${MYSQL_CONFIG+set} != xset ; then
|
||||
MYSQL_CONFIG=$mysql_prefix/bin/mysql_config
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_REQUIRE([AC_CANONICAL_TARGET])
|
||||
AC_PATH_PROG(MYSQL_CONFIG, mysql_config, no)
|
||||
min_mysql_version=ifelse([$1], ,0.11.0,$1)
|
||||
AC_MSG_CHECKING(for MYSQL - version >= $min_mysql_version)
|
||||
no_mysql=""
|
||||
if test "$MYSQL_CONFIG" = "no" ; then
|
||||
no_mysql=yes
|
||||
else
|
||||
MYSQL_CFLAGS=`$MYSQL_CONFIG $mysqlconf_args --cflags | sed -e "s/'//g"`
|
||||
MYSQL_LIBS=`$MYSQL_CONFIG $mysqlconf_args --libs | sed -e "s/'//g"`
|
||||
|
||||
mysql_major_version=`$MYSQL_CONFIG $mysql_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
||||
mysql_minor_version=`$MYSQL_CONFIG $mysql_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
||||
mysql_micro_version=`$MYSQL_CONFIG $mysql_config_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
||||
if test "x$enable_mysqltest" = "xyes" ; then
|
||||
ac_save_CFLAGS="$CFLAGS"
|
||||
ac_save_LIBS="$LIBS"
|
||||
CFLAGS="$CFLAGS $MYSQL_CFLAGS"
|
||||
LIBS="$LIBS $MYSQL_LIBS"
|
||||
dnl
|
||||
dnl Now check if the installed MYSQL is sufficiently new. (Also sanity
|
||||
dnl checks the results of mysql_config to some extent
|
||||
dnl
|
||||
rm -f conf.mysqltest
|
||||
AC_TRY_RUN([
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <mysql.h>
|
||||
|
||||
char*
|
||||
my_strdup (char *str)
|
||||
{
|
||||
char *new_str;
|
||||
|
||||
if (str)
|
||||
{
|
||||
new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
|
||||
strcpy (new_str, str);
|
||||
}
|
||||
else
|
||||
new_str = NULL;
|
||||
|
||||
return new_str;
|
||||
}
|
||||
|
||||
int main (int argc, char *argv[])
|
||||
{
|
||||
int major, minor, micro;
|
||||
char *tmp_version;
|
||||
|
||||
/* This hangs on some systems (?)
|
||||
system ("touch conf.mysqltest");
|
||||
*/
|
||||
{ FILE *fp = fopen("conf.mysqltest", "a"); if ( fp ) fclose(fp); }
|
||||
|
||||
/* HP/UX 9 (%@#!) writes to sscanf strings */
|
||||
tmp_version = my_strdup("$min_mysql_version");
|
||||
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
|
||||
printf("%s, bad version string\n", "$min_mysql_version");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
if (($mysql_major_version > major) ||
|
||||
(($mysql_major_version == major) && ($mysql_minor_version > minor)) ||
|
||||
(($mysql_major_version == major) && ($mysql_minor_version == minor) && ($mysql_micro_version >= micro)))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
printf("\n*** 'mysql_config --version' returned %d.%d.%d, but the minimum version\n", $mysql_major_version, $mysql_minor_version, $mysql_micro_version);
|
||||
printf("*** of MYSQL required is %d.%d.%d. If mysql_config is correct, then it is\n", major, minor, micro);
|
||||
printf("*** best to upgrade to the required version.\n");
|
||||
printf("*** If mysql_config was wrong, set the environment variable MYSQL_CONFIG\n");
|
||||
printf("*** to point to the correct copy of mysql_config, and remove the file\n");
|
||||
printf("*** config.cache before re-running configure\n");
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
],, no_mysql=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
fi
|
||||
if test "x$no_mysql" = x ; then
|
||||
AC_MSG_RESULT(yes)
|
||||
ifelse([$2], , :, [$2])
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
if test "$MYSQL_CONFIG" = "no" ; then
|
||||
echo "*** The mysql_config script installed by MYSQL could not be found"
|
||||
echo "*** If MYSQL was installed in PREFIX, make sure PREFIX/bin is in"
|
||||
echo "*** your path, or set the MYSQL_CONFIG environment variable to the"
|
||||
echo "*** full path to mysql_config."
|
||||
else
|
||||
if test -f conf.mysqltest ; then
|
||||
:
|
||||
else
|
||||
echo "*** Could not run MYSQL test program, checking why..."
|
||||
CFLAGS="$CFLAGS $MYSQL_CFLAGS"
|
||||
LIBS="$LIBS $MYSQL_LIBS"
|
||||
AC_TRY_LINK([
|
||||
#include <stdio.h>
|
||||
#include <mysql.h>
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{ return 0; }
|
||||
#undef main
|
||||
#define main K_and_R_C_main
|
||||
], [ return 0; ],
|
||||
[ echo "*** The test program compiled, but did not run. This usually means"
|
||||
echo "*** that the run-time linker is not finding MYSQL or finding the wrong"
|
||||
echo "*** version of MYSQL. If it is not finding MYSQL, you'll need to set your"
|
||||
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
|
||||
echo "*** to the installed location Also, make sure you have run ldconfig if that"
|
||||
echo "*** is required on your system"
|
||||
echo "***"
|
||||
echo "*** If you have an old version installed, it is best to remove it, although"
|
||||
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
|
||||
[ echo "*** The test program failed to compile or link. See the file config.log for the"
|
||||
echo "*** exact error that occured. This usually means MYSQL was incorrectly installed"
|
||||
echo "*** or that you have moved MYSQL since it was installed. In the latter case, you"
|
||||
echo "*** may want to edit the mysql_config script: $MYSQL_CONFIG" ])
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
fi
|
||||
MYSQL_CFLAGS=""
|
||||
MYSQL_LIBS=""
|
||||
ifelse([$3], , :, [$3])
|
||||
fi
|
||||
AC_SUBST(MYSQL_CFLAGS)
|
||||
AC_SUBST(MYSQL_LIBS)
|
||||
rm -f conf.mysqltest
|
||||
])
|
||||
|
||||
|
||||
@ -94,10 +94,10 @@ static pstring fileselection = "";
|
||||
extern file_info def_finfo;
|
||||
|
||||
/* timing globals */
|
||||
int get_total_size = 0;
|
||||
int get_total_time_ms = 0;
|
||||
static int put_total_size = 0;
|
||||
static int put_total_time_ms = 0;
|
||||
SMB_BIG_UINT get_total_size = 0;
|
||||
unsigned int get_total_time_ms = 0;
|
||||
static SMB_BIG_UINT put_total_size = 0;
|
||||
static unsigned int put_total_time_ms = 0;
|
||||
|
||||
/* totals globals */
|
||||
static double dir_total;
|
||||
|
||||
@ -749,7 +749,7 @@ AC_CHECK_FUNCS(setpriv setgidx setuidx setgroups sysconf mktime rename ftruncate
|
||||
AC_CHECK_FUNCS(lstat64 fopen64 atexit grantpt dup2 lseek64 ftruncate64 readdir64)
|
||||
AC_CHECK_FUNCS(fseek64 fseeko64 ftell64 ftello64 setluid getpwanam setlinebuf)
|
||||
AC_CHECK_FUNCS(srandom random srand rand setenv usleep strcasecmp fcvt fcvtl symlink readlink)
|
||||
AC_CHECK_FUNCS(syslog vsyslog getgrouplist)
|
||||
AC_CHECK_FUNCS(syslog vsyslog getgrouplist timegm)
|
||||
# setbuffer is needed for smbtorture
|
||||
AC_CHECK_FUNCS(setbuffer)
|
||||
|
||||
@ -2069,6 +2069,17 @@ if test x"$with_ldap_support" = x"yes"; then
|
||||
fi
|
||||
fi
|
||||
|
||||
########################################################
|
||||
# Compile with MySQL support?
|
||||
AM_PATH_MYSQL()
|
||||
CFLAGS="$CFLAGS $MYSQL_CFLAGS"
|
||||
|
||||
|
||||
########################################################
|
||||
# Compile with XML support?
|
||||
AM_PATH_XML2()
|
||||
CFLAGS="$CFLAGS $XML_CFLAGS"
|
||||
|
||||
#################################################
|
||||
# check for automount support
|
||||
AC_MSG_CHECKING(whether to use AUTOMOUNT)
|
||||
@ -2195,6 +2206,24 @@ if test x"$samba_cv_HAVE_TRUNCATED_SALT" = x"yes"; then
|
||||
fi
|
||||
fi
|
||||
|
||||
# New experimental SAM system
|
||||
|
||||
AC_MSG_CHECKING([whether to build the new (experimental) SAM database])
|
||||
AC_ARG_WITH(sam,
|
||||
[ --with-sam Build new (experimental) SAM database (default=no)],
|
||||
[ case "$withval" in
|
||||
yes)
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(WITH_SAM,1,[Whether to build the new (experimental) SAM database])
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT(no)
|
||||
;;
|
||||
esac ],
|
||||
AC_MSG_RESULT(no)
|
||||
)
|
||||
|
||||
|
||||
########################################################################################
|
||||
##
|
||||
## TESTS FOR SAM BACKENDS. KEEP THESE GROUPED TOGETHER
|
||||
@ -2385,7 +2414,7 @@ AC_ARG_WITH(manpages-langs,
|
||||
esac
|
||||
|
||||
AC_MSG_RESULT($manlangs)
|
||||
manlangs=`echo $manlangs | sed "s/,/ /"` # replacing commas with spaces to produce a list
|
||||
manlangs=`echo $manlangs | sed "s/,/ /g"` # replacing commas with spaces to produce a list
|
||||
AC_SUBST(manlangs)],
|
||||
|
||||
[manlangs="en"
|
||||
@ -3131,7 +3160,7 @@ AC_SUBST(builddir)
|
||||
# I added make files that are outside /source directory.
|
||||
# I know this is not a good solution, will work out a better
|
||||
# solution soon. --simo
|
||||
AC_OUTPUT(include/stamp-h Makefile script/findsmb ../examples/VFS/Makefile ../examples/pdb/mysql/Makefile ../examples/pdb/xml/Makefile)
|
||||
AC_OUTPUT(include/stamp-h Makefile script/findsmb ../examples/VFS/Makefile)
|
||||
|
||||
#################################################
|
||||
# Print very concise instructions on building/use
|
||||
|
||||
@ -1163,5 +1163,9 @@ int asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3);
|
||||
#define VA_COPY(dest, src) (dest) = (src)
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_TIMEGM
|
||||
time_t timegm(struct tm *tm);
|
||||
#endif
|
||||
|
||||
#endif /* _INCLUDES_H */
|
||||
|
||||
|
||||
@ -1702,5 +1702,12 @@ typedef struct {
|
||||
|
||||
extern struct poptOption popt_common_debug[];
|
||||
extern struct poptOption popt_common_configfile[];
|
||||
extern struct poptOption popt_common_socket_options[];
|
||||
extern struct poptOption popt_common_version[];
|
||||
extern struct poptOption popt_common_netbios_name[];
|
||||
extern struct poptOption popt_common_log_base[];
|
||||
|
||||
/* Module support */
|
||||
typedef NTSTATUS (init_module_function) (void);
|
||||
|
||||
#endif /* _SMB_H */
|
||||
|
||||
@ -23,9 +23,12 @@
|
||||
#include "includes.h"
|
||||
|
||||
/* Handle command line options:
|
||||
* -d,--debuglevel
|
||||
* -s,--configfile
|
||||
* -O,--socket-options
|
||||
* d,--debuglevel
|
||||
* s,--configfile
|
||||
* O,--socket-options
|
||||
* V,--version
|
||||
* l,--log-base
|
||||
* n,--netbios-name
|
||||
*/
|
||||
|
||||
extern pstring user_socket_options;
|
||||
@ -37,6 +40,23 @@ static void popt_common_callback(poptContext con,
|
||||
const struct poptOption *opt,
|
||||
const char *arg, const void *data)
|
||||
{
|
||||
pstring logfile;
|
||||
const char *pname;
|
||||
|
||||
/* Find out basename of current program */
|
||||
pname = strrchr_m(poptGetInvocationName(con),'/');
|
||||
|
||||
if (!pname)
|
||||
pname = poptGetInvocationName(con);
|
||||
else
|
||||
pname++;
|
||||
|
||||
if (reason == POPT_CALLBACK_REASON_PRE) {
|
||||
pstr_sprintf(logfile, "%s/log.%s", dyn_LOGFILEBASE, pname);
|
||||
lp_set_logfile(logfile);
|
||||
return;
|
||||
}
|
||||
|
||||
switch(opt->val) {
|
||||
case 'd':
|
||||
if (arg) {
|
||||
@ -51,16 +71,29 @@ static void popt_common_callback(poptContext con,
|
||||
break;
|
||||
|
||||
case 'O':
|
||||
pstrcpy(user_socket_options,arg);
|
||||
if (arg) {
|
||||
pstrcpy(user_socket_options,arg);
|
||||
}
|
||||
break;
|
||||
|
||||
case 's':
|
||||
pstrcpy(dyn_CONFIGFILE, arg);
|
||||
if (arg) {
|
||||
pstrcpy(dyn_CONFIGFILE, arg);
|
||||
}
|
||||
break;
|
||||
|
||||
case 'n':
|
||||
pstrcpy(global_myname,arg);
|
||||
strupper(global_myname);
|
||||
if (arg) {
|
||||
pstrcpy(global_myname,arg);
|
||||
strupper(global_myname);
|
||||
}
|
||||
break;
|
||||
|
||||
case 'l':
|
||||
if (arg) {
|
||||
pstr_sprintf(logfile, "%s/log.%s", arg, pname);
|
||||
lp_set_logfile(logfile);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -95,3 +128,9 @@ struct poptOption popt_common_netbios_name[] = {
|
||||
{"netbiosname", 'n', POPT_ARG_STRING, NULL, 'n', "Primary netbios name"},
|
||||
{ 0 }
|
||||
};
|
||||
|
||||
struct poptOption popt_common_log_base[] = {
|
||||
{ NULL, 0, POPT_ARG_CALLBACK|POPT_CBFLAG_PRE, popt_common_callback },
|
||||
{ "log-basename", 'l', POPT_ARG_STRING, NULL, 'l', "Basename for log/debug files"},
|
||||
{ 0 }
|
||||
};
|
||||
|
||||
@ -430,3 +430,28 @@ char *rep_inet_ntoa(struct in_addr ip)
|
||||
#endif /* HAVE_VSYSLOG */
|
||||
|
||||
|
||||
#ifndef HAVE_TIMEGM
|
||||
/*
|
||||
see the timegm man page on linux
|
||||
*/
|
||||
time_t timegm(struct tm *tm)
|
||||
{
|
||||
time_t ret;
|
||||
char *tz;
|
||||
char *tzvar;
|
||||
|
||||
tz = getenv("TZ");
|
||||
putenv("TZ=");
|
||||
tzset();
|
||||
ret = mktime(tm);
|
||||
if (tz) {
|
||||
asprintf(&tzvar, "TZ=%s", tz);
|
||||
putenv(tzvar);
|
||||
safe_free(tzvar);
|
||||
} else {
|
||||
putenv("TZ");
|
||||
}
|
||||
tzset();
|
||||
return ret;
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
NBT netbios routines and daemon - version 2
|
||||
Copyright (C) Andrew Tridgell 1994-1998
|
||||
Copyright (C) Jeremy Allison 1997-2002
|
||||
Copyright (C) Jelmer Vernooij 2002 (Conversion to popt)
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -655,41 +656,32 @@ static BOOL init_structs(void)
|
||||
return( True );
|
||||
}
|
||||
|
||||
/**************************************************************************** **
|
||||
Usage on the program.
|
||||
**************************************************************************** */
|
||||
|
||||
static void usage(char *pname)
|
||||
{
|
||||
|
||||
printf( "Usage: %s [-DaiohV] [-H lmhosts file] [-d debuglevel] [-l log basename]\n", pname );
|
||||
printf( " [-n name] [-p port] [-s configuration file]\n" );
|
||||
printf( "\t-D Become a daemon (default)\n" );
|
||||
printf( "\t-a Append to log file (default)\n" );
|
||||
printf( "\t-i Run interactive (not a daemon)\n" );
|
||||
printf( "\t-o Overwrite log file, don't append\n" );
|
||||
printf( "\t-h Print usage\n" );
|
||||
printf( "\t-V Print version\n" );
|
||||
printf( "\t-H hosts file Load a netbios hosts file\n" );
|
||||
printf( "\t-d debuglevel Set the debuglevel\n" );
|
||||
printf( "\t-l log basename. Basename for log/debug files\n" );
|
||||
printf( "\t-n netbiosname. Primary netbios name\n" );
|
||||
printf( "\t-p port Listen on the specified port\n" );
|
||||
printf( "\t-s configuration file Configuration file name\n" );
|
||||
printf( "\n");
|
||||
}
|
||||
|
||||
|
||||
/**************************************************************************** **
|
||||
main program
|
||||
**************************************************************************** */
|
||||
int main(int argc,char *argv[])
|
||||
int main(int argc, const char *argv[])
|
||||
{
|
||||
int opt;
|
||||
extern char *optarg;
|
||||
extern BOOL append_log;
|
||||
BOOL opt_interactive = False;
|
||||
pstring logfile;
|
||||
extern BOOL append_log;
|
||||
static BOOL opt_interactive = False;
|
||||
poptContext pc;
|
||||
struct poptOption long_options[] = {
|
||||
POPT_AUTOHELP
|
||||
{"daemon", 'D', POPT_ARG_VAL, &is_daemon, True, "Become a daemon(default)" },
|
||||
{"log-append", 'a', POPT_ARG_VAL, &append_log, True, "Append to log file" },
|
||||
{"interactive", 'i', POPT_ARG_VAL, &opt_interactive, True, "Run interactive (not a daemon)" },
|
||||
{"log-overwrite", 'o', POPT_ARG_VAL, &append_log, False, "Overwrite log file, don't append" },
|
||||
{"hosts", 'H', POPT_ARG_STRING, dyn_LMHOSTSFILE, 'H', "Load a netbios hosts file"},
|
||||
{"port", 'p', POPT_ARG_INT, &global_nmb_port, NMB_PORT, "Listen on the specified port" },
|
||||
{NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debug },
|
||||
{NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_configfile },
|
||||
{NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_socket_options },
|
||||
{NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version },
|
||||
{NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_netbios_name },
|
||||
{NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_log_base },
|
||||
{ NULL }
|
||||
};
|
||||
int opt;
|
||||
pstring logfile;
|
||||
|
||||
append_log = True; /* Default, override with '-o' option. */
|
||||
|
||||
@ -703,13 +695,6 @@ static void usage(char *pname)
|
||||
slprintf(logfile, sizeof(logfile)-1, "%s/log.nmbd", dyn_LOGFILEBASE);
|
||||
lp_set_logfile(logfile);
|
||||
|
||||
/* this is for people who can't start the program correctly */
|
||||
while (argc > 1 && (*argv[1] != '-'))
|
||||
{
|
||||
argv++;
|
||||
argc--;
|
||||
}
|
||||
|
||||
fault_setup((void (*)(void *))fault_continue );
|
||||
|
||||
/* POSIX demands that signals are inherited. If the invoking process has
|
||||
@ -730,70 +715,13 @@ static void usage(char *pname)
|
||||
#if defined(SIGUSR2)
|
||||
BlockSignals(True, SIGUSR2);
|
||||
#endif
|
||||
pc = poptGetContext("nmbd", argc, argv, long_options, 0);
|
||||
|
||||
while((opt = poptGetNextOpt(pc)) != -1)
|
||||
{ }
|
||||
|
||||
while( EOF !=
|
||||
(opt = getopt( argc, argv, "Vaos:T:I:C:bAB:N:Rn:l:d:Dp:hSH:G:f:i" )) )
|
||||
{
|
||||
switch (opt)
|
||||
{
|
||||
case 's':
|
||||
pstrcpy(dyn_CONFIGFILE, optarg);
|
||||
break;
|
||||
case 'N':
|
||||
case 'B':
|
||||
case 'I':
|
||||
case 'C':
|
||||
case 'G':
|
||||
DEBUG(0,("Obsolete option '%c' used\n",opt));
|
||||
break;
|
||||
case 'i':
|
||||
opt_interactive = True;
|
||||
break;
|
||||
case 'H':
|
||||
pstrcpy(dyn_LMHOSTSFILE, optarg);
|
||||
break;
|
||||
case 'n':
|
||||
pstrcpy(global_myname,optarg);
|
||||
strupper(global_myname);
|
||||
break;
|
||||
case 'l':
|
||||
slprintf(logfile, sizeof(logfile)-1, "%s/log.nmbd", optarg);
|
||||
lp_set_logfile(logfile);
|
||||
break;
|
||||
case 'a':
|
||||
append_log = True;
|
||||
break;
|
||||
case 'o':
|
||||
append_log = False;
|
||||
break;
|
||||
case 'D':
|
||||
is_daemon = True;
|
||||
break;
|
||||
case 'd':
|
||||
DEBUGLEVEL = atoi(optarg);
|
||||
break;
|
||||
case 'p':
|
||||
global_nmb_port = atoi(optarg);
|
||||
break;
|
||||
case 'h':
|
||||
usage(argv[0]);
|
||||
exit(0);
|
||||
break;
|
||||
case 'V':
|
||||
printf( "Version %s\n", VERSION );
|
||||
exit(0);
|
||||
break;
|
||||
default:
|
||||
if( !is_a_socket(0) )
|
||||
{
|
||||
DEBUG(0,("Incorrect program usage - is the command line correct?\n"));
|
||||
usage(argv[0]);
|
||||
exit(0);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
poptFreeContext(pc);
|
||||
|
||||
setup_logging( argv[0], opt_interactive );
|
||||
|
||||
reopen_logs();
|
||||
|
||||
@ -1907,49 +1907,49 @@ static NTSTATUS ldapsam_add_sam_account(struct pdb_methods *my_methods, SAM_ACCO
|
||||
return NT_STATUS_OK;
|
||||
}
|
||||
|
||||
static NTSTATUS ldapsam_getgrsid(struct pdb_methods *methods, GROUP_MAP *map,
|
||||
static NTSTATUS lsapsam_getgrsid(struct pdb_methods *methods, GROUP_MAP *map,
|
||||
DOM_SID sid, BOOL with_priv)
|
||||
{
|
||||
return get_group_map_from_sid(sid, map, with_priv) ?
|
||||
NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
|
||||
}
|
||||
|
||||
static NTSTATUS ldapsam_getgrgid(struct pdb_methods *methods, GROUP_MAP *map,
|
||||
static NTSTATUS lsapsam_getgrgid(struct pdb_methods *methods, GROUP_MAP *map,
|
||||
gid_t gid, BOOL with_priv)
|
||||
{
|
||||
return get_group_map_from_gid(gid, map, with_priv) ?
|
||||
NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
|
||||
}
|
||||
|
||||
static NTSTATUS ldapsam_getgrnam(struct pdb_methods *methods, GROUP_MAP *map,
|
||||
static NTSTATUS lsapsam_getgrnam(struct pdb_methods *methods, GROUP_MAP *map,
|
||||
char *name, BOOL with_priv)
|
||||
{
|
||||
return get_group_map_from_ntname(name, map, with_priv) ?
|
||||
NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
|
||||
}
|
||||
|
||||
static NTSTATUS ldapsam_add_group_mapping_entry(struct pdb_methods *methods,
|
||||
static NTSTATUS lsapsam_add_group_mapping_entry(struct pdb_methods *methods,
|
||||
GROUP_MAP *map)
|
||||
{
|
||||
return add_mapping_entry(map, TDB_INSERT) ?
|
||||
NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
|
||||
}
|
||||
|
||||
static NTSTATUS ldapsam_update_group_mapping_entry(struct pdb_methods *methods,
|
||||
static NTSTATUS lsapsam_update_group_mapping_entry(struct pdb_methods *methods,
|
||||
GROUP_MAP *map)
|
||||
{
|
||||
return add_mapping_entry(map, TDB_REPLACE) ?
|
||||
NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
|
||||
}
|
||||
|
||||
static NTSTATUS ldapsam_delete_group_mapping_entry(struct pdb_methods *methods,
|
||||
static NTSTATUS lsapsam_delete_group_mapping_entry(struct pdb_methods *methods,
|
||||
DOM_SID sid)
|
||||
{
|
||||
return group_map_remove(sid) ?
|
||||
NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
|
||||
}
|
||||
|
||||
static NTSTATUS ldapsam_enum_group_mapping(struct pdb_methods *methods,
|
||||
static NTSTATUS lsapsam_enum_group_mapping(struct pdb_methods *methods,
|
||||
enum SID_NAME_USE sid_name_use,
|
||||
GROUP_MAP **rmap, int *num_entries,
|
||||
BOOL unix_only, BOOL with_priv)
|
||||
|
||||
@ -208,6 +208,7 @@ int main(int argc, const char *argv[])
|
||||
|
||||
pc = poptGetContext(NULL, argc, argv, long_options,
|
||||
POPT_CONTEXT_KEEP_FIRST);
|
||||
poptSetOtherOptionHelp(pc, "[OPTION...] <config-file> [host-name] [host-ip]");
|
||||
|
||||
while((opt = poptGetNextOpt(pc)) != -1);
|
||||
|
||||
|
||||
@ -696,9 +696,9 @@ static void wizard_page(void)
|
||||
/* Now determine smb.conf WINS settings */
|
||||
if (lp_wins_support())
|
||||
winstype = 1;
|
||||
/* if (strlen(lp_wins_server_list()) != 0 )
|
||||
* winstype = 2;
|
||||
*/
|
||||
if (lp_wins_server_list() && strlen(*lp_wins_server_list()))
|
||||
winstype = 2;
|
||||
|
||||
|
||||
/* Do we have a homes share? */
|
||||
have_home = lp_servicenumber(HOMES_NAME);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user