Few problems with INN 2.3.0 BETA

[Katsuhiro Kondou]

In article <20000523095146.A858 at fiona.ambre.net>,
	"Benjamin `Quisar' Lerman" <quisar at quisar.ambre.net> wrote;

}  The second bug of misfeature (I don't know) is that INN is not adding a
} Sender header when the reader is authentificated via identd, but only
} when it uses authinfo commands.

Attached could fix this, but I think we need to discuss whether
successful res/auth in readers.conf means the user is auhenticated.
-- 
Katsuhiro Kondou

--- nnrpd/perm.c.orig	Mon Apr 10 16:56:55 2000
+++ nnrpd/perm.c	Thu May 25 07:33:04 2000
@@ -1163,6 +1163,7 @@
 	    strcat(PERMuser, auth_realms[i]->default_domain);
 	}
 	PERMneedauth = FALSE;
+	PERMauthorized = TRUE;
 	success_auth = auth_realms[i];
 	syslog(L_TRACE, "%s res %s", ClientHost, PERMuser);
     } else if (!canauthenticate) {
@@ -1226,6 +1227,7 @@
 	    strcat(PERMuser, auth_realms[i]->default_domain);
 	}
 	PERMneedauth = FALSE;
+	PERMauthorized = TRUE;
 	success_auth = auth_realms[i];
     }
 }
--- nnrpd/post.c.orig	Fri May 12 14:40:20 2000
+++ nnrpd/post.c	Thu May 25 07:07:51 2000
@@ -357,8 +357,17 @@
 	 * our info.  If not authorized, zap the Sender so we don't put out
 	 * unauthenticated data. */
 	if (PERMauthorized && HDR(_sender) == NULL) {
-	    (void)sprintf(sendbuff, "%s@%s",
-		PERMuser[0] ? PERMuser : "UNKNOWN", ClientHost);
+	    if (PERMuser[0] == NULL) {
+		(void)sprintf(sendbuff, "%s@%s", "UNKNOWN", ClientHost);
+	    } else {
+		if ((p = strchr(PERMuser, '@')) == NULL) {
+		    (void)sprintf(sendbuff, "%s@%s", PERMuser, ClientHost);
+		} else {
+		    *p = '\0';
+		    (void)sprintf(sendbuff, "%s@%s", PERMuser, ClientHost);
+		    *p = '@';
+		}
+	    }
 	    HDR(_sender) = sendbuff;
 	}
 	else if (!PERMauthorized)