X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=options.c;h=88f64246fe932a027736e617ffc787e75168f908;hp=6f74533f02700f959820017aafa0be24f1719017;hb=882882e0e2f6c451c4b9a5aa8209aa60352049c9;hpb=6db34c1dca5c3a2acd0af689319b583ff8271dbc

diff --git a/options.c b/options.c
index 6f74533..88f6424 100644
--- a/options.c
+++ b/options.c
@@ -9,14 +9,16 @@
 **                                                                           **
 \*****************************************************************************/ 
 
-#include "stdio.h"
-#include "string.h"
-#include "stdarg.h"
-#include "unistd.h"
-#include "stdlib.h"
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+#include <unistd.h>
+#include <stdlib.h>
 #include "macro.h"
 #include "extension.h"
 #include "options.h"
+#include <grp.h>
+#include <pwd.h>
 
 struct options options = {
 	"/usr/local/lcr/log",		/* log file */
@@ -31,7 +33,10 @@ struct options options = {
 	"lcr@your.machine",		/* source mail adress */
 	"/var/tmp",			/* path of lock files */
 	0700,				/* rights of lcr admin socket */
-	0				/* enable gsm */
+	-1,                             /* socket user (-1= no change) */
+	-1,                             /* socket group (-1= no change) */
+	0,				/* enable gsm */
+	1				/* use polling of main loop */
 };
 
 char options_error[256];
@@ -40,7 +45,7 @@ char options_error[256];
  *
  * read options from options.conf
  */
-int read_options(void)
+int read_options(char *options_error)
 {
 	FILE *fp=NULL;
 	char filename[128];
@@ -53,7 +58,7 @@ int read_options(void)
 	SPRINT(filename, "%s/options.conf", CONFIG_DATA);
 
 	if (!(fp=fopen(filename,"r"))) {
-		SPRINT(options_error, "Cannot open %s\n",filename);
+		UPRINT(options_error, "Cannot open %s\n",filename);
 		return(0);
 	}
 
@@ -76,7 +81,7 @@ int read_options(void)
 		i=0; /* read option */
 		while(*p > 32) {
 			if (i+1 >= sizeof(option)) {
-				SPRINT(options_error, "Error in %s (line %d): option too long.\n",filename,line);
+				UPRINT(options_error, "Error in %s (line %d): option too long.\n",filename,line);
 				goto error;
 			}
 			option[i+1] = '\0';
@@ -94,7 +99,7 @@ int read_options(void)
 			i=0; /* read param */
 			while(*p > 31) {
 				if (i+1 >= sizeof(param)) {
-					SPRINT(options_error, "Error in %s (line %d): param too long.\n",filename,line);
+					UPRINT(options_error, "Error in %s (line %d): param too long.\n",filename,line);
 					goto error;
 				}
 				param[i+1] = '\0';
@@ -106,12 +111,12 @@ int read_options(void)
 
 		/* check option */
 		if (!strcmp(option,"nt_if") || !strcmp(option,"te_if")) {
-			SPRINT(options_error, "Error in %s (line %d): obsolete option %s. Use multiple 'port' options to define ports to use.\n",filename,line,option);
+			UPRINT(options_error, "Error in %s (line %d): obsolete option %s. Use multiple 'port' options to define ports to use.\n",filename,line,option);
 			goto error;
 		} else
 		if (!strcmp(option,"debug")) {
 			if (param[0]==0) {
-				SPRINT(options_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line,option);
+				UPRINT(options_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line,option);
 				goto error;
 			}
 			options.deb = strtol(param, NULL, 0);
@@ -119,7 +124,7 @@ int read_options(void)
 		} else
 		if (!strcmp(option,"log")) {
 			if (param[0]==0) {
-				SPRINT(options_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line, option);
+				UPRINT(options_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line, option);
 				goto error;
 			}
 			SCPY(options.log, param);
@@ -135,7 +140,7 @@ int read_options(void)
 		} else
 		if (!strcmp(option,"tones_dir")) {
 			if (param[0]==0) {
-				SPRINT(options_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line,option);
+				UPRINT(options_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line,option);
 				goto error;
 			}
 			if (param[strlen(param)-1] == '/')
@@ -145,7 +150,7 @@ int read_options(void)
 		} else
 		if (!strcmp(option,"fetch_tones")) {
 			if (param[0]==0) {
-				SPRINT(options_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line,option);
+				UPRINT(options_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line,option);
 				goto error;
 			}
 			if (param[strlen(param)-1] == '/')
@@ -169,24 +174,24 @@ int read_options(void)
 
 		} else
 		if (!strcmp(option,"dsptones")) {
-			SPRINT(options_error, "Error in %s (line %d): parameter 'dsptones' is obsolete. Just define the tones (american,german,oldgerman) at 'tones_dir' option.\n",filename,line,option);
+			UPRINT(options_error, "Error in %s (line %d): parameter 'dsptones' is obsolete. Just define the tones (american,german,oldgerman) at 'tones_dir' option.\n",filename,line);
 			goto error;
 		} else
 		if (!strcmp(option,"schedule")) {
 			options.schedule = atoi(param);
 			if (options.schedule < 0) {
-				SPRINT(options_error, "Error in %s (line %d): parameter for option %s must be at least '0'.\n", filename,line,option);
+				UPRINT(options_error, "Error in %s (line %d): parameter for option %s must be at least '0'.\n", filename,line,option);
 				goto error;
 			}
 			if (options.schedule > 99) {
-				SPRINT(options_error, "Error in %s (line %d): parameter for option %s must be '99' or less.\n", filename,line,option);
+				UPRINT(options_error, "Error in %s (line %d): parameter for option %s must be '99' or less.\n", filename,line,option);
 				goto error;
 			}
 
 		} else
 		if (!strcmp(option,"email")) {
 			if (param[0]==0) {
-				SPRINT(options_error, "Error in %s (line %d): parameter for option %s missing.\n", filename,line,option);
+				UPRINT(options_error, "Error in %s (line %d): parameter for option %s missing.\n", filename,line,option);
 				goto error;
 			}
 			SCPY(options.email, param);
@@ -194,7 +199,7 @@ int read_options(void)
 		} else
 		if (!strcmp(option,"lock")) {
 			if (param[0]==0) {
-				SPRINT(options_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line,option);
+				UPRINT(options_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line,option);
 				goto error;
 			}
 			if (param[strlen(param)-1] == '/')
@@ -202,19 +207,46 @@ int read_options(void)
 			SCPY(options.lock, param);
 
 		} else
+		if (!strcmp(option,"socketuser")) {
+			char * endptr = NULL;
+			options.socketuser = strtol(param, &endptr, 10);
+			if (*endptr != '\0') {
+				struct passwd * pwd = getpwnam(param);
+				if (pwd == NULL) {
+					UPRINT(options_error, "Error in %s (line %d): no such user: %s.\n",filename,line,param);
+					goto error;
+				}
+				options.socketuser = pwd->pw_uid;
+			}
+		} else
+		if (!strcmp(option,"socketgroup")) {
+			char * endptr = NULL;
+			options.socketgroup = strtol(param, &endptr, 10);
+			if (*endptr != '\0') {
+				struct group * grp = getgrnam(param);
+				if (grp == NULL) {
+					UPRINT(options_error, "Error in %s (line %d): no such group: %s.\n",filename,line,param);
+					goto error;
+				}
+				options.socketgroup = grp->gr_gid;
+			}
+		} else
 		if (!strcmp(option,"socketrights")) {
 			options.socketrights = strtol(param, NULL, 0);
 		} else
 		if (!strcmp(option,"gsm")) {
 			options.gsm = 1;
+		} else
+		if (!strcmp(option,"polling")) {
+			options.polling = 1;
 		} else {
-			SPRINT(options_error, "Error in %s (line %d): wrong option keyword %s.\n", filename,line,option);
+			UPRINT(options_error, "Error in %s (line %d): wrong option keyword %s.\n", filename,line,option);
 			goto error;
 		}
 	}
 
 	if (!options.tones_dir[0]) {
-		SPRINT(options_error, "Error in %s (line %d): option 'tones_dir' with parameter missing.\n", filename);
+		UPRINT(options_error, "Error in %s (line %d): option 'tones_dir' with parameter missing.\n", filename,line);
 		goto error;
 	}
 	if (fp) fclose(fp);