Generate mon_*_passwords in configure

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1548 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 65b1846376ba2aa8644649b3845dbb8da92323f6..6b3cb7eb4ebf7327c531e775bcd1d7d7864f2467 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -849,11 +849,72 @@ if test "x$sd_password" = "x" ; then
    sd_password=$key
 fi
 
+mon_dir_password=
+AC_ARG_WITH(mon-dir-password,
+   [  --with-mon-dir-password=PASSWORD   specify Director's password used by the monitor],
+   [
+       if test "x$withval" != "xno" ; then     
+          mon_dir_password=$withval
+       fi
+   ]
+)
+
+if test "x$mon_dir_password" = "x" ; then
+   if test "x$OPENSSL" = "xnone" ; then
+#     key=`date | uuencode /dev/stdout | tr "\"@\\\`\\ \\=\\,\\(\\)\\#\\.\\!\\-$'" abcdefghijklmnopqrst | awk '{getline} {print} {exit}'`
+      key=`autoconf/randpass 33`
+   else
+      key=`openssl rand -base64 33`
+   fi
+   mon_dir_password=$key
+fi
+
+mon_fd_password=
+AC_ARG_WITH(mon-fd-password,
+   [  --with-mon-fd-password=PASSWORD    specify Client's password used by the monitor],
+   [
+       if test "x$withval" != "xno" ; then     
+          mon_fd_password=$withval
+       fi
+   ]
+)
+
+if test "x$mon_fd_password" = "x" ; then
+   if test "x$OPENSSL" = "xnone" ; then
+#     key=`date | uuencode /dev/stdout | tr "\"@\\\`\\ \\=\\,\\(\\)\\#\\.\\!\\-$'" tsrqponmlkjihgfedcba | awk '{getline} {print} {exit}'`
+      key=`autoconf/randpass 37`
+   else
+      key=`openssl rand -base64 33`
+   fi
+   mon_fd_password=$key
+fi
+
+mon_sd_password=
+AC_ARG_WITH(mon-sd-password,
+   [  --with-mon-sd-password=PASSWORD    specify Storage daemon's password used by the monitor],
+   [
+       if test "x$withval" != "xno" ; then     
+          mon_sd_password=$withval
+       fi
+   ]
+)
+
+if test "x$mon_sd_password" = "x" ; then
+   if test "x$OPENSSL" = "xnone" ; then
+#     key=`date | uuencode /dev/stdout | tr "\"@\\\`\\ \\=\\,\\(\\)\\#\\.\\!\\-$'" 123456789uvwxyzabcdef | awk '{getline} {print} {exit}'`
+      key=`autoconf/randpass 41`
+   else
+      key=`openssl rand -base64 33`
+   fi
+   mon_sd_password=$key
+fi
 
 AC_SUBST(dir_password)
 AC_SUBST(fd_password)
 AC_SUBST(sd_password)
-
+AC_SUBST(mon_dir_password)
+AC_SUBST(mon_fd_password)
+AC_SUBST(mon_sd_password)
 
 #
 # Handle users and groups for each daemon

diff --git a/bacula/configure b/bacula/configure
index 0810f6f97a19ef1d0f509dd75b36e125905c7f6a..26f3b1d49c0999a36cd2cf491ff0ac8e0800ed39 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -309,7 +309,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BUILD_DIR TRUEPRG FALSEPRG VERSION DATE LSMDATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB MV RM CP SED AWK ECHO CMP TBL AR OPENSSL MTX PKGCONFIG WXCONFIG ARFLAGS MAKE_SHELL LOCAL_LIBS LOCAL_CFLAGS LOCAL_LDFLAGS LOCAL_DEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os HAVE_SUN_OS_TRUE HAVE_SUN_OS_FALSE HAVE_OSF1_OS_TRUE HAVE_OSF1_OS_FALSE HAVE_AIX_OS_TRUE HAVE_AIX_OS_FALSE HAVE_HPUX_OS_TRUE HAVE_HPUX_OS_FALSE HAVE_LINUX_OS_TRUE HAVE_LINUX_OS_FALSE HAVE_FREEBSD_OS_TRUE HAVE_FREEBSD_OS_FALSE HAVE_NETBSD_OS_TRUE HAVE_NETBSD_OS_FALSE HAVE_OPENBSD_OS_TRUE HAVE_OPENBSD_OS_FALSE HAVE_BSDI_OS_TRUE HAVE_BSDI_OS_FALSE HAVE_SGI_OS_TRUE HAVE_SGI_OS_FALSE HAVE_IRIX_OS_TRUE HAVE_IRIX_OS_FALSE HAVE_DARWIN_OS_TRUE HAVE_DARWIN_OS_FALSE INSIDE_GNOME_COMMON_TRUE INSIDE_GNOME_COMMON_FALSE MSGFMT GNOME_INCLUDEDIR GNOMEUI_LIBS GNOME_LIBDIR GNOME_LIBS GNOMEGNORBA_LIBS GTKXMHTML_LIBS ZVT_LIBS GNOME_CONFIG ORBIT_CONFIG ORBIT_IDL HAVE_ORBIT_TRUE HAVE_ORBIT_FALSE ORBIT_CFLAGS ORBIT_LIBS HAVE_GNORBA_TRUE HAVE_GNORBA_FALSE GNORBA_CFLAGS GNORBA_LIBS GNOME_APPLETS_LIBS GNOME_DOCKLETS_LIBS GNOME_CAPPLET_LIBS GNOME_DIR WXCONS_CPPFLAGS WXCONS_LDFLAGS WX_DIR TRAY_MONITOR_CPPFLAGS TRAY_MONITOR_LDFLAGS TRAY_MONITOR_DIR TTOOL_LDFLAGS STATIC_FD STATIC_SD STATIC_DIR STATIC_CONS STATIC_GNOME_CONS STATIC_WX_CONS ALL_DIRS CONS_INC CONS_OBJ CONS_SRC CONS_LIBS CONS_LDFLAGS READLINE_SRC working_dir scriptdir dump_email job_email smtp_host piddir subsysdir baseport dir_port fd_port sd_port dir_password fd_password sd_password dir_user dir_group sd_user sd_group fd_user fd_group SBINPERM SQL_LFLAGS SQL_INCLUDE SQL_BINDIR cats DB_NAME GETCONF ac_ct_GETCONF X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBOBJS ALLOCA FDLIBS DEBUG DINCLUDE DLIB DB_LIBS WCFLAGS WLDFLAGS OBJLIST hostname TAPEDRIVE PSCMD WIN32 MACOSX DISTNAME DISTVER LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BUILD_DIR TRUEPRG FALSEPRG VERSION DATE LSMDATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB MV RM CP SED AWK ECHO CMP TBL AR OPENSSL MTX PKGCONFIG WXCONFIG ARFLAGS MAKE_SHELL LOCAL_LIBS LOCAL_CFLAGS LOCAL_LDFLAGS LOCAL_DEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os HAVE_SUN_OS_TRUE HAVE_SUN_OS_FALSE HAVE_OSF1_OS_TRUE HAVE_OSF1_OS_FALSE HAVE_AIX_OS_TRUE HAVE_AIX_OS_FALSE HAVE_HPUX_OS_TRUE HAVE_HPUX_OS_FALSE HAVE_LINUX_OS_TRUE HAVE_LINUX_OS_FALSE HAVE_FREEBSD_OS_TRUE HAVE_FREEBSD_OS_FALSE HAVE_NETBSD_OS_TRUE HAVE_NETBSD_OS_FALSE HAVE_OPENBSD_OS_TRUE HAVE_OPENBSD_OS_FALSE HAVE_BSDI_OS_TRUE HAVE_BSDI_OS_FALSE HAVE_SGI_OS_TRUE HAVE_SGI_OS_FALSE HAVE_IRIX_OS_TRUE HAVE_IRIX_OS_FALSE HAVE_DARWIN_OS_TRUE HAVE_DARWIN_OS_FALSE INSIDE_GNOME_COMMON_TRUE INSIDE_GNOME_COMMON_FALSE MSGFMT GNOME_INCLUDEDIR GNOMEUI_LIBS GNOME_LIBDIR GNOME_LIBS GNOMEGNORBA_LIBS GTKXMHTML_LIBS ZVT_LIBS GNOME_CONFIG ORBIT_CONFIG ORBIT_IDL HAVE_ORBIT_TRUE HAVE_ORBIT_FALSE ORBIT_CFLAGS ORBIT_LIBS HAVE_GNORBA_TRUE HAVE_GNORBA_FALSE GNORBA_CFLAGS GNORBA_LIBS GNOME_APPLETS_LIBS GNOME_DOCKLETS_LIBS GNOME_CAPPLET_LIBS GNOME_DIR WXCONS_CPPFLAGS WXCONS_LDFLAGS WX_DIR TRAY_MONITOR_CPPFLAGS TRAY_MONITOR_LDFLAGS TRAY_MONITOR_DIR TTOOL_LDFLAGS STATIC_FD STATIC_SD STATIC_DIR STATIC_CONS STATIC_GNOME_CONS STATIC_WX_CONS ALL_DIRS CONS_INC CONS_OBJ CONS_SRC CONS_LIBS CONS_LDFLAGS READLINE_SRC working_dir scriptdir dump_email job_email smtp_host piddir subsysdir baseport dir_port fd_port sd_port dir_password fd_password sd_password mon_dir_password mon_fd_password mon_sd_password dir_user dir_group sd_user sd_group fd_user fd_group SBINPERM SQL_LFLAGS SQL_INCLUDE SQL_BINDIR cats DB_NAME GETCONF ac_ct_GETCONF X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBOBJS ALLOCA FDLIBS DEBUG DINCLUDE DLIB DB_LIBS WCFLAGS WLDFLAGS OBJLIST hostname TAPEDRIVE PSCMD WIN32 MACOSX DISTNAME DISTVER LTLIBOBJS'
 ac_subst_files='MCOMMON'
 
 # Initialize some variables set by options.
@@ -891,6 +891,9 @@ Optional Packages:
   --with-dir-password=PASSWORD   specify Director's password
   --with-fd-password=PASSWORD    specify Client's password
   --with-sd-password=PASSWORD    specify Storage daemon's password
+  --with-mon-dir-password=PASSWORD   specify Director's password used by the monitor
+  --with-mon-fd-password=PASSWORD    specify Client's password used by the monitor
+  --with-mon-sd-password=PASSWORD    specify Storage daemon's password used by the monitor
   --with-dir-user=USER          specify user for Director daemon
   --with-dir-group=GROUP                specify group for Director daemon
   --with-sd-user=USER           specify user for Storage daemon
@@ -7358,6 +7361,76 @@ if test "x$sd_password" = "x" ; then
    sd_password=$key
 fi
 
+mon_dir_password=
+
+# Check whether --with-mon-dir-password or --without-mon-dir-password was given.
+if test "${with_mon_dir_password+set}" = set; then
+  withval="$with_mon_dir_password"
+
+       if test "x$withval" != "xno" ; then
+          mon_dir_password=$withval
+       fi
+
+
+fi;
+
+if test "x$mon_dir_password" = "x" ; then
+   if test "x$OPENSSL" = "xnone" ; then
+#     key=`date | uuencode /dev/stdout | tr "\"@\\\`\\ \\=\\,\\(\\)\\#\\.\\!\\-$'" abcdefghijklmnopqrst | awk '{getline} {print} {exit}'`
+      key=`autoconf/randpass 33`
+   else
+      key=`openssl rand -base64 33`
+   fi
+   mon_dir_password=$key
+fi
+
+mon_fd_password=
+
+# Check whether --with-mon-fd-password or --without-mon-fd-password was given.
+if test "${with_mon_fd_password+set}" = set; then
+  withval="$with_mon_fd_password"
+
+       if test "x$withval" != "xno" ; then
+          mon_fd_password=$withval
+       fi
+
+
+fi;
+
+if test "x$mon_fd_password" = "x" ; then
+   if test "x$OPENSSL" = "xnone" ; then
+#     key=`date | uuencode /dev/stdout | tr "\"@\\\`\\ \\=\\,\\(\\)\\#\\.\\!\\-$'" tsrqponmlkjihgfedcba | awk '{getline} {print} {exit}'`
+      key=`autoconf/randpass 37`
+   else
+      key=`openssl rand -base64 33`
+   fi
+   mon_fd_password=$key
+fi
+
+mon_sd_password=
+
+# Check whether --with-mon-sd-password or --without-mon-sd-password was given.
+if test "${with_mon_sd_password+set}" = set; then
+  withval="$with_mon_sd_password"
+
+       if test "x$withval" != "xno" ; then
+          mon_sd_password=$withval
+       fi
+
+
+fi;
+
+if test "x$mon_sd_password" = "x" ; then
+   if test "x$OPENSSL" = "xnone" ; then
+#     key=`date | uuencode /dev/stdout | tr "\"@\\\`\\ \\=\\,\\(\\)\\#\\.\\!\\-$'" 123456789uvwxyzabcdef | awk '{getline} {print} {exit}'`
+      key=`autoconf/randpass 41`
+   else
+      key=`openssl rand -base64 33`
+   fi
+   mon_sd_password=$key
+fi
+
+
 
 
 
@@ -21530,6 +21603,9 @@ s,@sd_port@,$sd_port,;t t
 s,@dir_password@,$dir_password,;t t
 s,@fd_password@,$fd_password,;t t
 s,@sd_password@,$sd_password,;t t
+s,@mon_dir_password@,$mon_dir_password,;t t
+s,@mon_fd_password@,$mon_fd_password,;t t
+s,@mon_sd_password@,$mon_sd_password,;t t
 s,@dir_user@,$dir_user,;t t
 s,@dir_group@,$dir_group,;t t
 s,@sd_user@,$sd_user,;t t