welterde/l2tpns
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove non-working setuid option

Browse source
This commit is contained in:
bodea 2006-04-27 14:37:27 +00:00
parent 5e631c6978
commit 241d15a178
6 changed files with 6 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Changes
View file

@ -1,7 +1,8 @@
* Thu Apr 27 2006 Brendan O'Dea <bod@optus.net> 2.2.0 * Fri Apr 28 2006 Brendan O'Dea <bod@optus.net> 2.2.0
- Only poll clifd if successfully bound. - Only poll clifd if successfully bound.
- Add "Practical VPNs" document from Liran Tal as Docs/vpn . - Add "Practical VPNs" document from Liran Tal as Docs/vpn .
- Add Multilink support from Khaled Al Hamwi. - Add Multilink support from Khaled Al Hamwi.
- Remove non-working setuid option.
* Tue Apr 18 2006 Brendan O'Dea <bod@optus.net> 2.1.18 * Tue Apr 18 2006 Brendan O'Dea <bod@optus.net> 2.1.18
- Don't shutdown on TerminateReq, wait for CDN. - Don't shutdown on TerminateReq, wait for CDN.

6
Docs/startup-config.5
View file

@ -2,7 +2,7 @@
.de Id .de Id
.ds Dt \\$4 \\$5 .ds Dt \\$4 \\$5
.. ..
.Id $Id: startup-config.5,v 1.16 2006/04/27 09:53:50 bodea Exp $ .Id $Id: startup-config.5,v 1.17 2006/04/27 14:38:14 bodea Exp $
.TH STARTUP-CONFIG 5 "\*(Dt" L2TPNS "File Formats and Conventions" .TH STARTUP-CONFIG 5 "\*(Dt" L2TPNS "File Formats and Conventions"
.SH NAME .SH NAME
startup\-config \- configuration file for l2tpns startup\-config \- configuration file for l2tpns
@ -152,10 +152,6 @@ session requires two buckets (in and out).
If set to a directory, then every 5 minutes the current usage for If set to a directory, then every 5 minutes the current usage for
every connected use will be dumped to a file in this directory. every connected use will be dumped to a file in this directory.
.TP .TP
.B setuid
After starting up and binding the interface, change UID to this. This
doesn't work properly.
.TP
.B dump_speed .B dump_speed
If set to true, then the current bandwidth utilization will be logged If set to true, then the current bandwidth utilization will be logged
every second. Even if this is disabled, you can see this information every second. Even if this is disabled, you can see this information

3
etc/startup-config.default
View file

@ -62,9 +62,6 @@ set accounting_dir "/var/run/l2tpns/acct"
# Number of buckets to allocate for throttling # Number of buckets to allocate for throttling
#set throttle_buckets 3000 #set throttle_buckets 3000
# If set to anything other than 0, setuid when initialised.
#set setuid 0
# If set to true, dump current speed to stderr every second # If set to true, dump current speed to stderr every second
#set dump_speed no #set dump_speed no

7
l2tpns.c
View file

@ -4,7 +4,7 @@
// Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced
// vim: sw=8 ts=8 // vim: sw=8 ts=8
char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.163 2006/04/27 09:53:49 bodea Exp $"; char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.164 2006/04/27 14:37:27 bodea Exp $";
#include <arpa/inet.h> #include <arpa/inet.h>
#include <assert.h> #include <assert.h>
@ -134,7 +134,6 @@ config_descriptt config_values[] = {
CONFIG("throttle_speed", rl_rate, UNSIGNED_LONG), CONFIG("throttle_speed", rl_rate, UNSIGNED_LONG),
CONFIG("throttle_buckets", num_tbfs, INT), CONFIG("throttle_buckets", num_tbfs, INT),
CONFIG("accounting_dir", accounting_dir, STRING), CONFIG("accounting_dir", accounting_dir, STRING),
CONFIG("setuid", target_uid, INT),
CONFIG("dump_speed", dump_speed, BOOL), CONFIG("dump_speed", dump_speed, BOOL),
CONFIG("multi_read_count", multi_read_count, INT), CONFIG("multi_read_count", multi_read_count, INT),
CONFIG("scheduler_fifo", scheduler_fifo, BOOL), CONFIG("scheduler_fifo", scheduler_fifo, BOOL),
@ -4472,10 +4471,6 @@ int main(int argc, char *argv[])
LOG(0, 0, 0, "Can't lock pages: %s\n", strerror(errno)); LOG(0, 0, 0, "Can't lock pages: %s\n", strerror(errno));
} }
// Drop privileges here
if (config->target_uid > 0 && geteuid() == 0)
setuid(config->target_uid);
mainloop(); mainloop();
/* remove plugins (so cleanup code gets run) */ /* remove plugins (so cleanup code gets run) */

3
l2tpns.h
View file

@ -1,5 +1,5 @@
// L2TPNS Global Stuff // L2TPNS Global Stuff
// $Id: l2tpns.h,v 1.115 2006/04/27 09:53:50 bodea Exp $ // $Id: l2tpns.h,v 1.116 2006/04/27 14:37:28 bodea Exp $
#ifndef __L2TPNS_H__ #ifndef __L2TPNS_H__
#define __L2TPNS_H__ #define __L2TPNS_H__
@ -654,7 +654,6 @@ typedef struct
in_addr_t peer_address; in_addr_t peer_address;
int send_garp; // Set to true to garp for vip address on startup int send_garp; // Set to true to garp for vip address on startup
int target_uid;
int dump_speed; int dump_speed;
char plugins[64][MAXPLUGINS]; char plugins[64][MAXPLUGINS];
char old_plugins[64][MAXPLUGINS]; char old_plugins[64][MAXPLUGINS];

2
l2tpns.spec
View file

@ -43,5 +43,5 @@ rm -rf %{buildroot}
%attr(644,root,root) /usr/share/man/man[58]/* %attr(644,root,root) /usr/share/man/man[58]/*
%changelog %changelog
* Thu Apr 27 2006 Brendan O'Dea <bod@optus.net> 2.2.0-1 * Fri Apr 28 2006 Brendan O'Dea <bod@optus.net> 2.2.0-1
- 2.2.0 release, see /usr/share/doc/l2tpns-2.2.0/Changes - 2.2.0 release, see /usr/share/doc/l2tpns-2.2.0/Changes