5977 2005-01-27 09:27:09 +0300 --pidfile option doesn't work 2005-07-13 15:47:23 +0400 1 1 5 Archive ALT Linux 2.4 pptpd 2.4 all Linux CLOSED FIXED P2 normal --- 1 vod pilot cas oldest_to_newest 21413 0 vod 2005-01-27 09:27:09 +0300 --pidfile options for pptpd doesn't work, it always create default pidfile /var/ run/pptpd.pid error in pptpd.c, function log_pid here is small patch -------------------------------------------------------------------------- --- poptop-1.1.4.orig/pptpd.c 2003-02-27 15:01:10 +0500 +++ poptop-1.1.4/pptpd.c 2005-01-27 11:02:22 +0500 @@ -76,7 +76,7 @@ static void my_daemon(int argc, char **argv); #endif -static void log_pid(); +static void log_pid(char *pid_file); static char *lookup(char *); static void showusage(char *prog) @@ -347,21 +347,20 @@ ledman_cmd(LEDMAN_CMD_ON, LEDMAN_VPN); #endif /* after we have our final pid... */ - log_pid(); - + log_pid(pid_file); + pptp_manager(argc, argv); return 1; } -static void log_pid() { +static void log_pid(char *pid_file) { FILE *f; pid_t pid; - char *pidfile = "/var/run/pptpd.pid"; pid = getpid(); - if ((f = fopen(pidfile, "w")) == NULL) { + if ((f = fopen(pid_file, "w")) == NULL) { syslog(LOG_ERR, "PPTPD: failed to open(%s), errno=%d\n", - pidfile, errno); + pid_file, errno); return; } fprintf(f, "%d\n", pid); -------------------------------------------------------------------------- 21727 1 722 pilot 2005-02-07 17:45:28 +0300 Created attachment 722 моя версия патча Я думаю, будет лучше в таком виде. 21728 2 pilot 2005-02-07 17:46:33 +0300 Реализовано в pptpd-1.1.4-alt4.b4 21736 3 vod 2005-02-07 19:21:25 +0300 (In reply to comment #1) > Created an attachment (id=722) [edit] > моя версия патча > Я думаю, будет лучше в таком виде. Да, так оно лучше. По большому счету надо бы "/var/run/pptpd.pid" вообще в define вынести... 722 2005-02-07 17:45:28 +0300 2005-02-07 17:45:28 +0300 моя версия патча pptpd-1.1.4-b4-alt-pidfile.patch text/plain 865 pilot ZGlmZiAtdXJOIHBvcHRvcC0xLjEuNC5vcmlnL3BwdHBkLmMgcG9wdG9wLTEuMS40L3BwdHBkLmMK LS0tIHBvcHRvcC0xLjEuNC5vcmlnL3BwdHBkLmMJMjAwMy0wMi0yNyAxMzowMToxMCArMDMwMAor KysgcG9wdG9wLTEuMS40L3BwdHBkLmMJMjAwNS0wMi0wNyAxNzo1NTozNyArMDMwMApAQCAtNzYs NyArNzYsNyBAQAogc3RhdGljIHZvaWQgbXlfZGFlbW9uKGludCBhcmdjLCBjaGFyICoqYXJndik7 CiAjZW5kaWYKIAotc3RhdGljIHZvaWQgbG9nX3BpZCgpOworc3RhdGljIHZvaWQgbG9nX3BpZChj aGFyICpwaWRfZmlsZSk7CiBzdGF0aWMgY2hhciAqbG9va3VwKGNoYXIgKik7CiAKIHN0YXRpYyB2 b2lkIHNob3d1c2FnZShjaGFyICpwcm9nKQpAQCAtMzQ3LDE2ICszNDcsMTYgQEAKIAlsZWRtYW5f Y21kKExFRE1BTl9DTURfT04sIExFRE1BTl9WUE4pOwogI2VuZGlmCiAJLyogYWZ0ZXIgd2UgaGF2 ZSBvdXIgZmluYWwgcGlkLi4uICovCi0JbG9nX3BpZCgpOworCWxvZ19waWQocGlkX2ZpbGUpOwog CiAJcHB0cF9tYW5hZ2VyKGFyZ2MsIGFyZ3YpOwogCXJldHVybiAxOwogfQogCi1zdGF0aWMgdm9p ZCBsb2dfcGlkKCkgeworc3RhdGljIHZvaWQgbG9nX3BpZChjaGFyICpwaWRfZmlsZSkgewogICAg ICAgICBGSUxFICAgICpmOwogICAgICAgICBwaWRfdCAgIHBpZDsKLSAgICAgICAgY2hhciAgICAq cGlkZmlsZSA9ICIvdmFyL3J1bi9wcHRwZC5waWQiOworICAgICAgICBjaGFyICAgICpwaWRmaWxl ID0gcGlkX2ZpbGUgPyBwaWRfZmlsZSA6ICIvdmFyL3J1bi9wcHRwZC5waWQiOwogCiAgICAgICAg IHBpZCA9IGdldHBpZCgpOwogICAgICAgICBpZiAoKGYgPSBmb3BlbihwaWRmaWxlLCAidyIpKSA9 PSBOVUxMKSB7Cg==