X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fqt-console%2Fmain.cpp;h=9c315903edc061edf55f2339058afaa05a6f1075;hb=afd4ac31e0f65357c5264c04b804e86b2095a304;hp=3e3cab1a046bdf87f3209fe7009f499e2a38765a;hpb=217e5ed47147cd420ed0799a96868a561bfd6b57;p=bacula%2Fbacula

diff --git a/bacula/src/qt-console/main.cpp b/bacula/src/qt-console/main.cpp
index 3e3cab1a04..9c315903ed 100644
--- a/bacula/src/qt-console/main.cpp
+++ b/bacula/src/qt-console/main.cpp
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2007-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -35,9 +35,9 @@
  */ 
 
 
+#include "bat.h"
 #include <QApplication>
 #include <QTranslator>
-#include "bat.h"
 
 MainWin *mainWin;
 QApplication *app;
@@ -136,7 +136,9 @@ int main(int argc, char *argv[])
    }
 
    OSDependentInit();
+#ifdef HAVE_WIN32
    WSA_Init();                        /* Initialize Windows sockets */
+#endif
 
    if (configfile == NULL) {
       configfile = bstrdup(CONFIG_FILE);
@@ -181,28 +183,6 @@ PROG_COPYRIGHT
    exit(1);
 }
 
-#ifdef xxx
-/*
- * Call-back for reading a passphrase for an encrypted PEM file
- * This function uses getpass(), which uses a static buffer and is NOT thread-safe.
- */
-static int tls_pem_callback(char *buf, int size, const void *userdata)
-{
-#ifdef HAVE_TLS
-   const char *prompt = (const char *) userdata;
-   char *passwd;
-
-   passwd = getpass(prompt);
-   bstrncpy(buf, passwd, size);
-   return (strlen(buf));
-#else
-   buf[0] = 0;
-   return 0;
-#endif
-}
-#endif
-
-
 /*
  * Make a quick check to see that we have all the
  * resources needed.