Додано патч від Alexey Osipov <lion-simba@pridelands.ru>

Виправлено читання конфігураційного файлу консольного авторизатора за
замовчуванням

diff --git a/projects/sgauth/main.cpp b/projects/sgauth/main.cpp
index c7b2bfdcaa49ff53f43a225f2e444f6d4cf56b52..cdda3cb978bb11b335ae8941bc8b5b1467293168 100644 (file)
--- a/projects/sgauth/main.cpp
+++ b/projects/sgauth/main.cpp
@@ -360,7 +360,7 @@ if (clnp->GetAuthorized())
     {
     cout << "Connect" << endl;
     clnp->Connect();
     {
     cout << "Connect" << endl;
     clnp->Connect();

-       }
+    }

 }
 //-----------------------------------------------------------------------------
 void CatchUSR2(int)
 }
 //-----------------------------------------------------------------------------
 void CatchUSR2(int)


@@ -416,9 +416,6 @@ return;
 //-----------------------------------------------------------------------------
 int main(int argc, char *argv[])
 {
 //-----------------------------------------------------------------------------
 int main(int argc, char *argv[])
 {

-//int port;
-//char *endptr;
-

 SETTINGS settings;
 
 #ifndef WIN32
 SETTINGS settings;
 
 #ifndef WIN32


@@ -428,13 +425,6 @@ if(0)
 #endif
     {
     settings.SetConfFile(argv[1]);
 #endif
     {
     settings.SetConfFile(argv[1]);

-    if (settings.ReadSettings())
-        {
-        printf("ReadSettingsError\n");
-        printf("%s\n", settings.GetStrError().c_str());
-        exit(-1);
-        }
-    settings.Print();

     }
 else
     {
     }
 else
     {


@@ -457,7 +447,13 @@ else
         }*/
     }
 
         }*/
     }
 

-//settings.Print();
+if (settings.ReadSettings())
+    {
+    printf("ReadSettingsError\n");
+    printf("%s\n", settings.GetStrError().c_str());
+    exit(-1);
+    }
+settings.Print();

 
 #ifndef WIN32
 if (settings.GetDaemon())
 
 #ifndef WIN32
 if (settings.GetDaemon())


@@ -468,22 +464,19 @@ if (settings.GetDaemon())
 
     switch (fork())
         {
 
     switch (fork())
         {

-        case -1:    // ìÁÖÁ
+        case -1:

             exit(1);
             break;
 
             exit(1);
             break;
 

-        case 0:    // ðÏÔÏÍÏË
+        case 0:

             setsid();
             break;
 
             setsid();
             break;
 

-        default:    // ïÓÎÏ×ÎÏÊ ÐÒÏÃÅÓÓ
+        default:

             exit(0);
             break;
         }
     }
             exit(0);
             break;
         }
     }

-
-
-

 #endif
 
 clnp = new IA_CLIENT_PROT(settings.GetServerName(), settings.GetServerPort(), settings.GetLocalPort());
 #endif
 
 clnp = new IA_CLIENT_PROT(settings.GetServerName(), settings.GetServerPort(), settings.GetLocalPort());


@@ -506,7 +499,6 @@ clnp->SetDirNameCb(SetDirName, NULL);
 clnp->SetStatChangedCb(StatUpdate, NULL);
 clnp->SetReconnect(settings.GetReconnect());
 
 clnp->SetStatChangedCb(StatUpdate, NULL);
 clnp->SetReconnect(settings.GetReconnect());
 

-

 clnp->Start();
 
 SetSignalHandlers();
 clnp->Start();
 
 SetSignalHandlers();


@@ -568,5 +560,3 @@ while (1)
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-
-