X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=main.c;h=140fc508374b6e273fe46f3cbfcdae89af555a11;hp=7290af9773f1a73595162c6c77b4538bdaab5008;hb=c33007184de93d4a36bc16461964753946437916;hpb=f851ca0d9e22673b7cc0a7c2f539c9d51b9b77f8

diff --git a/main.c b/main.c
index 7290af9..140fc50 100644
--- a/main.c
+++ b/main.c
@@ -332,11 +332,13 @@ int main(int argc, char *argv[])
 		nooutput = 1;
 
 		/* write pid file */
-		pidfile = fopen("/var/run/lcr.pid","w");
+		SPRINT(lock, "%s/lcr.pid", options.lock);
+		pidfile = fopen(lock,"w");
 		if (pidfile) {
 			fprintf(pidfile, "%d\n", getpid());
 			fclose(pidfile);
-		}
+		} else
+			fprintf(stderr, "Failed to create PID file: %s\n", lock);
 	} else
 	/* if not start */
 	if (!!strcasecmp(argv[1],"start")) {
@@ -579,8 +581,10 @@ free:
 	if (created_lock)
 		flock(lockfd, LOCK_UN);
 	if (lockfd >= 0) {
-		chmod(lock, 0700);
-		unlink(lock);
+		if (created_lock) {
+			chmod(lock, 0700);
+			unlink(lock);
+		}
 		close(lockfd);
 	}
 
@@ -625,12 +629,6 @@ exit is done when interface is down
 	sip_exit();
 #endif
 
-#ifdef WITH_MISDN
-	/* close loopback, if used by GSM or remote */
-	if (mISDNloop.sock > -1)
-		mISDNloop_close();
-#endif
-
 	/* display memory leak */
 #define MEMCHECK(a, b) \
 	if (b) { \