git-svn-id: http://svncommunity.digium.com/svn/astmanproxy/branches/1.20pre@92 f02b47b9-160a-0410-81a6-dc3441afb0ec

7 files changed, 2 insertions, 22 deletions

diff --git a/src/astmanproxy.c b/src/astmanproxy.c
index 0cc3a6a..9eb5ac6 100644
--- a/src/astmanproxy.c
+++ b/src/astmanproxy.c
@@ -266,7 +266,7 @@ void *session_do(struct mansession *s)
 
         if (res > 0) {
             /* Check for anything that requires proxy-side processing */
-            if (pc.key && !s->authenticated) {
+            if (pc.key[0] != '\0' && !s->authenticated) {
                 key = astman_get_header(&m, "ProxyKey");
                 if (!strcmp(key, pc.key) ) {
                    pthread_mutex_lock(&s->lock);
diff --git a/src/config.c b/src/config.c
index b7bbdc7..c8c9d80 100644
--- a/src/config.c
+++ b/src/config.c
@@ -190,11 +190,7 @@ int LoadHandlers() {
                     io->write = wh;
                 if (och)
                     io->onconnect = och;
-                io->autodisconnect = dlsym(dlhandle, "_autodisconnect");
-                if ((error = dlerror()) != NULL)  {
-                    if (debug)
-                        debugmsg("loading: note, %s_autodisconnect not defined; ignoring", fmt);
-                }
+
                 io->dlhandle = dlhandle;
                 io->next = iohandlers;
                 iohandlers = io;
diff --git a/src/csv.c b/src/csv.c
index fb26f3b..94d9a00 100644
--- a/src/csv.c
+++ b/src/csv.c
@@ -28,6 +28,3 @@ int _write(struct mansession *s, struct message *m) {
     return 0;
 }
 
-int _autodisconnect() {
-    return 0;
-}
diff --git a/src/http.c b/src/http.c
index 8fd5520..4f107db 100644
--- a/src/http.c
+++ b/src/http.c
@@ -152,8 +152,4 @@ int _read(struct mansession *s, struct message *m) {
     return -1;
 }
 
-int _autodisconnect() {
-    return 1;
-}
-
 /* We do not define a _write or _onconnect method */
diff --git a/src/include/astmanproxy.h b/src/include/astmanproxy.h
index a8cb26b..db370dc 100644
--- a/src/include/astmanproxy.h
+++ b/src/include/astmanproxy.h
@@ -80,7 +80,6 @@ struct iohandler {
     int (*read) ();
     int (*write) ();
     int (*onconnect) ();
-    int *(*autodisconnect)(void);
     char formatname[80];
     void *dlhandle;
     struct iohandler *next;
diff --git a/src/standard.c b/src/standard.c
index 0b2bd17..9e8f200 100644
--- a/src/standard.c
+++ b/src/standard.c
@@ -68,6 +68,3 @@ int _onconnect(struct mansession *s, struct message *m) {
     return 0;
 }
 
-int _autodisconnect() {
-    return 0;
-}
diff --git a/src/xml.c b/src/xml.c
index 2f3f9d0..72dc4fb 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -98,11 +98,6 @@ int _write(struct mansession *s, struct message *m) {
     return 0;
 }
 
-int _autodisconnect() {
-    return 0;
-}
-
-
 /* Takes a single manager header line and converts xml entities */
 void xml_quote_string(char *s, char *o) {