X-Git-Url: http://git.pjr.cc/?p=ga4php.git;a=blobdiff_plain;f=authserver%2Fauthd%2Fauthd.php;h=df57ed1809647bdef7c35cc1b9aae1dc8c1182f8;hp=520a39f8e0e14a52e4e9da484c4c5c6f1df0d810;hb=da4ac26dcfd94c9f8b7e8e43f50f671bdd94dfd0;hpb=c3c37cd9f486175adf0351de80c19efd02892ca6

diff --git a/authserver/authd/authd.php b/authserver/authd/authd.php
index 520a39f..df57ed1 100644
--- a/authserver/authd/authd.php
+++ b/authserver/authd/authd.php
@@ -44,6 +44,7 @@ if($pid == -1) {
 					$clients[$i]["ip"] = $row["rad_ip"];
 					$clients[$i]["secret"] = $row["rad_secret"];
 					$clients[$i]["desc"] = $row["rad_desc"];
+					$i++;
 				}
 				msg_send($cl_queue, MSG_GET_RADIUS_CLIENTS, $clients);
 				break;
@@ -62,11 +63,31 @@ if($pid == -1) {
 				$clientsecret = $msg["clientsecret"];
 				$clientip = $msg["clientip"];
 				$clientdesc = $msg["clientdescription"];
-				$sql = "insert into radclients values (NULL, '$client', '$clientip', '$clientsecret', '$clientdesc')";
 				$dbo = getDatabase();
+				
+				// check for existing clients with same name
+				$sql = "select * from radclients where rad_name='$client'";
+				echo "doing select, $sql\n";
 				$res = $dbo->query($sql);
-				updateRadius();
-				msg_send($cl_queue, MSG_ADD_RADIUS_CLIENT, true);
+				if($res->fetchColumn() > 0) {
+					msg_send($cl_queue, MSG_ADD_RADIUS_CLIENT, "name");
+						
+				} else {
+					// check for existing clients with same ip
+					$sql = "select * from radclients where rad_ip='$clientip'";
+					$res = $dbo->query($sql);
+					echo "doing select, $sql\n";
+					if($res->fetchColumn() > 0) {
+						msg_send($cl_queue, MSG_ADD_RADIUS_CLIENT, "ip");
+								
+					} else {
+						$sql = "insert into radclients values (NULL, '$client', '$clientip', '$clientsecret', '$clientdesc')";
+						$res = $dbo->query($sql);
+						updateRadius();
+						msg_send($cl_queue, MSG_ADD_RADIUS_CLIENT, true);
+						break;
+					}
+				}
 				break;
 			case MSG_DELETE_USER_TOKEN:
 				$username = $msg["username"];