X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fpopsbr.c;h=6f2b35ade848263a349022c7bf1cbe53a1557491;hb=b28e871ba874a53257b37eed94adfc365ed6ebf2;hp=eec025dc46584ac962c72e3404a0bd52a5cdce37;hpb=7736b0a60c15cc20db0ba8c3e0fe8e11d1c78c20;p=mmh

diff --git a/uip/popsbr.c b/uip/popsbr.c
index eec025d..6f2b35a 100644
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -89,7 +89,7 @@ pop_auth (char *user, char *pass)
 	return NULL;
     }
 
-    *++lp = NULL;
+    *(++lp) = '\0';
     snprintf (buffer, sizeof(buffer), "%s%s", cp, pass);
 
     MD5Init (&mdContext);
@@ -110,7 +110,7 @@ pop_auth (char *user, char *pass)
 	cp += 2;
 	buflen -= 2;
     }
-    *cp = NULL;
+    *cp = '\0';
 
     return buffer;
 }
@@ -118,7 +118,7 @@ pop_auth (char *user, char *pass)
 
 
 int
-pop_init (char *host, char *user, char *pass, int snoop, int rpop)
+pop_init (char *host, char *user, char *pass, int snoop, int rpop, int kpop)
 {
     int fd1, fd2;
     char buffer[BUFSIZ];
@@ -131,16 +131,24 @@ pop_init (char *host, char *user, char *pass, int snoop, int rpop)
 #endif
 
 #ifndef NNTP
-# ifndef KPOP
-    if ((fd1 = client (host, "tcp", POPSERVICE, rpop, response, sizeof(response))) == NOTOK)
-# else	/* KPOP */
-    snprintf (buffer, sizeof(buffer), "%s/%s", KPOP_PRINCIPAL, POPSERVICE);
-    if ((fd1 = client (host, "tcp", buffer, rpop, response, sizeof(response))) == NOTOK)
-# endif
+# ifdef KPOP
+    if ( kpop ) {
+	snprintf (buffer, sizeof(buffer), "%s/%s", KPOP_PRINCIPAL, "kpop");
+	if ((fd1 = client (host, "tcp", buffer, 0, response, sizeof(response))) == NOTOK) {
+	    return NOTOK;
+	}
+    } else {
+# endif /* KPOP */
+      if ((fd1 = client (host, "tcp", POPSERVICE, rpop, response, sizeof(response))) == NOTOK) {
+	    return NOTOK;
+      }
+# ifdef KPOP
+   }
+# endif /* KPOP */
 #else	/* NNTP */
     if ((fd1 = client (host, "tcp", "nntp", rpop, response, sizeof(response))) == NOTOK)
-#endif
 	return NOTOK;
+#endif
 
     if ((fd2 = dup (fd1)) == NOTOK) {
 	char *s;