)
AC_SUBST(db_user)
+db_password=
+AC_ARG_WITH(db_password,
+ [ --with-db-password=UNAME specify database password (default *none*)]
+ [
+ if test "x$withval" != "x" ; then
+ db_password=$withval
+ fi
+ ]
+)
+AC_SUBST(db_password)
#
# Handle users and groups for each daemon
mon_sd_password
db_name
db_user
+db_password
dir_user
dir_group
sd_user
--with-mon-sd-password=PASSWORD specify Storage daemon's password used by the monitor
--with-db-name=DBNAME specify database name (default bacula)
--with-db-user=UNAME specify database user (default bacula)
+ --with-db-password=UNAME specify database password (default *none*)
+
+ if test "x$withval" != "x" ; then
+ db_password=$withval
+ fi
+
+
--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
+db_password=
+
+# Check whether --with-db_password was given.
+if test "${with_db_password+set}" = set; then
+ withval=$with_db_password;
+fi
+
+
#
# Handle users and groups for each daemon
mon_sd_password!$mon_sd_password$ac_delim
db_name!$db_name$ac_delim
db_user!$db_user$ac_delim
+db_password!$db_password$ac_delim
dir_user!$dir_user$ac_delim
dir_group!$dir_group$ac_delim
sd_user!$sd_user$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 55; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 56; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
# Generic catalog service
Catalog {
Name = MyCatalog
- dbname = @db_name@; user = @db_user@; password = ""
+ dbname = "@db_name@"; dbuser = "@db_user@"; dbpassword = "@db_password@"
}
# Reasonable message delivery -- send most everything to email address
/* keep this password as store_str for the moment */
{"password", store_str, ITEM(res_cat.db_password), 0, 0, 0},
{"dbpassword", store_str, ITEM(res_cat.db_password), 0, 0, 0},
+ {"dbuser", store_str, ITEM(res_cat.db_user), 0, 0, 0},
{"user", store_str, ITEM(res_cat.db_user), 0, 0, 0},
{"dbname", store_str, ITEM(res_cat.db_name), 0, ITEM_REQUIRED, 0},
{"dbsocket", store_str, ITEM(res_cat.db_socket), 0, 0, 0},
General:
19Jun08
+kes Add dbuser to DIR conf file (replaces user).
+kes Add --with-db-password to ./configure
+kes Fix regress to handle db_password.
kes Fix a couple of pedantic compiler warnings.
ebl Fix bug when starting a restore on a storage that doesn't
have the requested MediaType.