Fix: haveged cannot be run as an application if also running as a daemon

2 files changed, 5 insertions, 2 deletions

diff --git a/man/haveged.8 b/man/haveged.8
index edbc611..f88dc76 100644
--- a/man/haveged.8
+++ b/man/haveged.8
@@ -188,7 +188,7 @@ If running as a daemon, access to the following files is required
 .I /proc/sys/kernel/osrelease
 .P
 .I /proc/sys/kernel/random/poolsize
-.P    
+.P
 .I /proc/sys/kernel/random/write_wakeup_threshold
 .RE
 
@@ -313,6 +313,9 @@ haveged -n 16T -o tba8cbw -f - | pv > /dev/null
 .TP
 Generate large amounts of data (16TB). Disable continuous tests for the maximum throughput but run the online tests at the startup to make sure that generator for properly initialized:
 haveged -n 16T -o tba8c -f - | pv > /dev/null
+.TP
+Create a password equivalent to a key strength of 256 bit
+haveged -f - -n 32 2>/dev/null | base64 | tr -d =
 
 .SH SEE ALSO
 .TP
diff --git a/src/haveged.c b/src/haveged.c
index 059bb28..59e62f5 100644
--- a/src/haveged.c
+++ b/src/haveged.c
@@ -435,7 +435,7 @@ int main(int argc, char **argv)
       close(socket_fd);
       return ret;
       }
-   else {
+   else if (!(params->setup & RUN_AS_APP)){
       socket_fd = cmd_listen(params);
       if (socket_fd >= 0)
          fprintf(stderr, "%s: command socket is listening at fd %d\n", params->daemon, socket_fd);