X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserver%2Fmodules%2Fxmpp%2Fxmpp_sasl_service.c;h=25b5195a9636744620f540cad10ac0131e7c85fc;hb=0b83ae50f5442c82dc8fb11ad3322d90383e34d5;hp=28f3c6a355e798ef4775ce22e4280ee2259ddc78;hpb=473c0f696929fd377c125443fd92b1df65ddbc61;p=citadel.git

diff --git a/citadel/server/modules/xmpp/xmpp_sasl_service.c b/citadel/server/modules/xmpp/xmpp_sasl_service.c
index 28f3c6a35..25b5195a9 100644
--- a/citadel/server/modules/xmpp/xmpp_sasl_service.c
+++ b/citadel/server/modules/xmpp/xmpp_sasl_service.c
@@ -1,18 +1,9 @@
-/*
- * Barebones SASL authentication service for XMPP (Jabber) clients.
- *
- * Note: RFC3920 says we "must" support DIGEST-MD5 but we only support PLAIN.
- *
- * Copyright (c) 2007-2019 by Art Cancro
- *
- * This program is open source software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
+// Barebones SASL authentication service for XMPP (Jabber) clients.
+//
+// Note: RFC3920 says we "must" support DIGEST-MD5 but we only support PLAIN.
+//
+// Copyright (c) 2007-2019 by Art Cancro
+// This program is open source software.  Use, duplication, or disclosure is subject to the GNU General Public License v3.
 
 #include "../../sysdep.h"
 #include <stdlib.h>
@@ -41,11 +32,8 @@
 #include "serv_xmpp.h"
 
 
-/*
- * PLAIN authentication.  Returns zero on success, nonzero on failure.
- */
-int xmpp_auth_plain(char *authstring)
-{
+// PLAIN authentication.  Returns zero on success, nonzero on failure.
+int xmpp_auth_plain(char *authstring) {
 	char decoded_authstring[1024];
 	char ident[256];
 	char user[256];
@@ -53,7 +41,7 @@ int xmpp_auth_plain(char *authstring)
 	int result;
 	long len;
 
-	/* Take apart the authentication string */
+	// Take apart the authentication string
 	memset(pass, 0, sizeof(pass));
 
 	CtdlDecodeBase64(decoded_authstring, authstring, strlen(authstring));
@@ -73,17 +61,15 @@ int xmpp_auth_plain(char *authstring)
 
 	if (result == login_ok) {
 		if (CtdlTryPassword(pass, len) == pass_ok) {
-			return(0);				/* success */
+			return(0);				// success
 		}
 	}
 
-	return(1);						/* failure */
+	return(1);						// failure
 }
 
 
-/*
- * Output the list of SASL mechanisms offered by this stream.
- */
+// Output the list of SASL mechanisms offered by this stream.
 void xmpp_output_auth_mechs(void) {
 	cprintf("<mechanisms xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">");
 	cprintf("<mechanism>PLAIN</mechanism>");
@@ -91,9 +77,7 @@ void xmpp_output_auth_mechs(void) {
 }
 
 
-/*
- * Here we go ... client is trying to authenticate.
- */
+// Here we go ... client is trying to authenticate.
 void xmpp_sasl_auth(char *sasl_auth_mech, char *authstring) {
 
 	if (strcasecmp(sasl_auth_mech, "PLAIN")) {
@@ -104,7 +88,7 @@ void xmpp_sasl_auth(char *sasl_auth_mech, char *authstring) {
 	}
 
         if (CC->logged_in) {
-		CtdlUserLogout();  /* Client may try to log in twice.  Handle this. */
+		CtdlUserLogout();  // Client may try to log in twice.  Handle this.
 	}
 
 	if (CC->nologin) {
@@ -125,27 +109,25 @@ void xmpp_sasl_auth(char *sasl_auth_mech, char *authstring) {
 }
 
 
-/*
- * Non-SASL authentication
- */
+// Non-SASL authentication
 void xmpp_non_sasl_authenticate(char *iq_id, char *username, char *password) {
 	int result;
 	char xmlbuf[256];
 
         if (CC->logged_in) {
-		CtdlUserLogout();  /* Client may try to log in twice.  Handle this. */
+		CtdlUserLogout();  // Client may try to log in twice.  Handle this.
 	}
 
 	result = CtdlLoginExistingUser(username);
 	if (result == login_ok) {
 		result = CtdlTryPassword(password, strlen(password));
 		if (result == pass_ok) {
-			cprintf("<iq type=\"result\" id=\"%s\"></iq>", xmlesc(xmlbuf, iq_id, sizeof xmlbuf));	/* success */
+			cprintf("<iq type=\"result\" id=\"%s\"></iq>", xmlesc(xmlbuf, iq_id, sizeof xmlbuf));	// success
 			return;
 		}
 	}
 
-	/* failure */
+	// failure
 	cprintf("<iq type=\"error\" id=\"%s\">", xmlesc(xmlbuf, iq_id, sizeof xmlbuf));
 	cprintf("<error code=\"401\" type=\"auth\">"
 		"<not-authorized xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"