filedaemon: cleanup after failed authentications

bareos · May 19, 2016 · 9d6c3e6 · 9d6c3e6
1 parent d313ee8
commit 9d6c3e6
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/filed/dir_cmd.c b/src/filed/dir_cmd.c
@@ -483,7 +483,7 @@ void *process_director_commands(JCR *jcr, BSOCK *dir)
 
    /**********FIXME******* add command handler error code */
 
-   while (!quit) {
+   while (jcr->authenticated && (!quit)) {
       /*
        * Read command
        */
@@ -547,7 +547,6 @@ void *process_director_commands(JCR *jcr, BSOCK *dir)
       Dmsg1(110, "End FD msg: %s\n", dir->msg);
    }
 
-bail_out:
    generate_plugin_event(jcr, bEventJobEnd);
 
    dequeue_messages(jcr);             /* send any queued messages */
@@ -629,13 +628,10 @@ void *handle_director_connection(BSOCK *dir)
    jcr = create_new_director_session(dir);
 
    Dmsg0(120, "Calling Authenticate\n");
-   if (!authenticate_director(jcr)) {
-      return NULL;
+   if (authenticate_director(jcr)) {
+      Dmsg0(120, "OK Authenticate\n");
    }
 
-   Dmsg0(120, "OK Authenticate\n");
-   jcr->authenticated = true;
-
    return process_director_commands(jcr, dir);
 }