Merge pull request #244 from joergsteffens/dev/joergs/master/minorfixes

3 minor fixes

core/manpages/bconsole.1

@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH CONSOLE 1 "4 December 2009" "Kern Sibbald" "Backup Archiving REcovery Open Sourced"
+.TH BCONSOLE 1 "2019-08-16" "Backup Archiving REcovery Open Sourced" "Bareos Console"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
@@ -27,22 +27,35 @@ List defined Directors.
 .BI \-c\  path
 Specify the configuration file or directory to use.
 .TP
+.BI \-p\  file
+Specify pam credentials file
+(first line: username, second line: password).
+.TP
+.BI \-o
+Send pam credentials over unencrypted connection.
+.TP
 .BI \-d\  nn
 Set debug level to \fInn\fP.
 .TP
 .BI \-dt
 Print timestamp in debug output.
 .TP
-.B \-s
+.BI \-s
 No signals (for debugging).
 .TP
-.B \-u\  nn
-Set command execution timeout to \fInn\fP seconds
+.BI \-u\  nn
+Set command execution timeout to \fInn\fP seconds.
 .TP
-.B \-t
+.BI \-t
 Test the configuration file and report errors.
 .TP
-.B \-?
+.BI \-xc
+Print configuration and exit.
+.TP
+.BI \-xs
+Print configuration file schema in JSON format and exit.
+.TP
+.BI \-?
 Show version and usage of program.
 .SH SEE ALSO
 .BR bareos\-dir (8),
@@ -52,4 +65,4 @@ Show version and usage of program.
 .SH AUTHOR
 This manual page was written by Jose Luis Tallon
 .nh
-<jltallon@adv\-solutions.net>.
+<jltallon@adv\-solutions.net> and others.

core/src/console/console.cc

@@ -113,13 +113,15 @@ static void usage()
   fprintf(
       stderr,
       _(PROG_COPYRIGHT
-        "\nVersion: " VERSION " (" BDATE ") %s %s %s\n\n"
+        "\n"
+        "Version: " VERSION " (" BDATE ") %s %s %s\n\n"
         "Usage: bconsole [-s] [-c config_file] [-d debug_level]\n"
         "        -D <dir>    select a Director\n"
-        "        -l          list Directors defined\n"
+        "        -l          list defined Directors\n"
         "        -c <path>   specify configuration file or directory\n"
 #if defined(HAVE_PAM)
-        "        -p <file>   specify pam credentials file\n"
+        "        -p <file>   specify pam credentials file\n
+        "                    (first line: username, second line: password)\n"
         "        -o          send pam credentials over unencrypted connection\n"
 #endif
         "        -d <nn>     set debug level to <nn>\n"

docs/manuals/source/TasksAndConcepts/PAM.rst

@@ -63,12 +63,13 @@ PAM Module
 ^^^^^^^^^^
 This is depending on the operating system and on the used pam module. For details read the manuals. The name of the service that has to be registered is **bareos**.
 
-Fedora 28 example: :
+Fedora 28 example:
 
 .. code-block:: bareosconfig
-  :caption: :file:`/etc/pam.d/bareos`
+   :caption: :file:`/etc/pam.d/bareos`
+
+   auth       required     pam_unix.so
 
-  auth       required     pam_unix.so
 
 .. warning::
 
@@ -114,3 +115,6 @@ Users have limited access to commands and jobs. Therefore the appropriate rights
      CommandACL = status, .status
      JobACL = *all*
   }
+
+
+Additional information can be found at https://github.com/bareos/bareos-contrib/tree/master/misc/bareos_pam_integration

systemtests/environment.in

@@ -36,7 +36,7 @@ logdir=@logdir@
 # to override the defaults
 export BAREOS_CONFIG_DIR=${conf}
 export BAREOS_SCRIPTS_DIR=${scripts}
-export BAREOS_SBIN_DIR=${bin}
+export BAREOS_SBIN_DIR=${sbin}
 export BAREOS_WORKING_DIR=${working}
 export BASEPORT=@BASEPORT@
 export BAREOS_DIRECTOR_PORT=@dir_port@