*/
#ifndef lint
-static char rcsid[] = "$Id: options.c,v 1.50 1999/03/08 05:34:44 paulus Exp $";
+static char rcsid[] = "$Id: options.c,v 1.55 1999/03/24 05:05:24 paulus Exp $";
#endif
#include <ctype.h>
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
-#include <limits.h>
#include <stdlib.h>
#include <termios.h>
#include <syslog.h>
#include <net/ppp-comp.h>
-#define FALSE 0
-#define TRUE 1
-
#if defined(ultrix) || defined(NeXT)
char *strdup __P((char *));
#endif
-#ifndef GIDSET_TYPE
-#define GIDSET_TYPE gid_t
-#endif
-
/*
* Option variables and default values.
*/
int debug = 0; /* Debug flag */
int kdebugflag = 0; /* Tell kernel to print debug messages */
int default_device = 1; /* Using /dev/tty or equivalent */
-char devnam[MAXPATHLEN] = "/dev/tty"; /* Device name */
+char devnam[MAXPATHLEN]; /* Device name */
int crtscts = 0; /* Use hardware flow control */
bool modem = 1; /* Use modem control lines */
int inspeed = 0; /* Input/Output speed requested */
char *connector = NULL; /* Script to establish physical link */
char *disconnector = NULL; /* Script to disestablish physical link */
char *welcomer = NULL; /* Script to run after phys link estab. */
+char *ptycommand = NULL; /* Command to run on other side of pty */
int maxconnect = 0; /* Maximum connect time */
char user[MAXNAMELEN]; /* Username for PAP */
char passwd[MAXSECRETLEN]; /* Password for PAP */
bool persist = 0; /* Reopen link after it goes down */
char our_name[MAXNAMELEN]; /* Our name for authentication purposes */
-char remote_name[MAXNAMELEN]; /* Peer's name for authentication */
-int explicit_remote = 0; /* User specified explicit remote name */
bool demand = 0; /* do dial-on-demand */
char *ipparam = NULL; /* Extra parameter for ip up/down scripts */
int idle_time_limit = 0; /* Disconnect if idle for this many seconds */
int holdoff = 30; /* # seconds to pause before reconnecting */
+bool notty = 0; /* Stdin/out is not a tty */
+char *record_file = NULL; /* File to record chars sent/received */
+int using_pty = 0;
extern option_t auth_options[];
struct option_info disconnector_info;
struct option_info welcomer_info;
struct option_info devnam_info;
+struct option_info ptycommand_info;
#ifdef PPP_FILTER
struct bpf_program pass_filter;/* Filter program for packets to pass */
static int callfile __P((char **));
static int showversion __P((char **));
static int showhelp __P((char **));
+static void usage __P((void));
#ifdef PPP_FILTER
static int setpassfilter __P((char **));
static option_t *find_option __P((char *name));
static int process_option __P((option_t *, char **));
static int n_arguments __P((option_t *));
+static int number_option __P((char *, u_int32_t *, int));
/*
* Valid arguments.
{ "-all", o_special_noarg, noopt,
"Don't request/allow any LCP or IPCP options (useless)" },
{ "connect", o_string, &connector,
- "A program to set up a connection", OPT_A2INFO, &connector_info },
+ "A program to set up a connection",
+ OPT_A2INFO | OPT_PRIVFIX, &connector_info },
{ "disconnect", o_string, &disconnector,
- "Program to disconnect serial device", OPT_A2INFO, &disconnector_info },
+ "Program to disconnect serial device",
+ OPT_A2INFO | OPT_PRIVFIX, &disconnector_info },
{ "welcome", o_string, &welcomer,
- "Script to welcome client", OPT_A2INFO, &welcomer_info },
+ "Script to welcome client",
+ OPT_A2INFO | OPT_PRIVFIX, &welcomer_info },
+ { "pty", o_string, &ptycommand,
+ "Script to run on pseudo-tty master side",
+ OPT_A2INFO | OPT_PRIVFIX, &ptycommand_info },
+ { "notty", o_bool, ¬ty,
+ "Input/output is not a tty", 1 },
+ { "record", o_string, &record_file,
+ "Record characters sent/received to file" },
{ "maxconnect", o_int, &maxconnect,
"Set connection time limit", OPT_LLIMIT|OPT_NOINCR|OPT_ZEROINF },
{ "crtscts", o_int, &crtscts,
/*
* scan_args - scan the command line arguments to get the tty name,
- * if specified.
+ * if specified. Also checks whether the notty or pty option was given.
*/
void
scan_args(argc, argv)
arg = *argv++;
--argc;
+ if (strcmp(arg, "notty") == 0 || strcmp(arg, "pty") == 0)
+ using_pty = 1;
+
/* Skip options and their arguments */
opt = find_option(arg);
if (opt != NULL) {
option_error("Can't open options file %s: %m", filename);
return 0;
}
-#if 0 /* check done by setting effective UID above */
- if (check_prot && !readable(fileno(f))) {
- option_error("Can't open options file %s: access denied", filename);
- fclose(f);
- return 0;
- }
-#endif
oldpriv = privileged_option;
privileged_option = priv;
char *user, *path, *file;
int ret;
struct passwd *pw;
+ size_t pl;
pw = getpwuid(getuid());
if (pw == NULL || (user = pw->pw_dir) == NULL || user[0] == 0)
return 1;
file = _PATH_USEROPT;
- path = malloc(strlen(user) + strlen(file) + 2);
+ pl = strlen(user) + strlen(file) + 2;
+ path = malloc(pl);
if (path == NULL)
novm("init file name");
- strcpy(path, user);
- strcat(path, "/");
- strcat(path, file);
+ slprintf(path, pl, "%s/%s", user, file);
ret = options_from_file(path, 0, 1, privileged);
free(path);
return ret;
{
char *dev, *path, *p;
int ret;
+ size_t pl;
dev = devnam;
if (strncmp(dev, "/dev/", 5) == 0)
dev += 5;
- if (strcmp(dev, "tty") == 0)
+ if (dev[0] == 0 || strcmp(dev, "tty") == 0)
return 1; /* don't look for /etc/ppp/options.tty */
- path = malloc(strlen(_PATH_TTYOPT) + strlen(dev) + 1);
+ pl = strlen(_PATH_TTYOPT) + strlen(dev) + 1;
+ path = malloc(pl);
if (path == NULL)
novm("tty init file name");
- strcpy(path, _PATH_TTYOPT);
+ slprintf(path, pl, "%s%s", _PATH_TTYOPT, dev);
/* Turn slashes into dots, for Solaris case (e.g. /dev/term/a) */
- for (p = path + strlen(path); *dev != 0; ++dev)
- *p++ = (*dev == '/'? '.': *dev);
- *p = 0;
+ for (p = path + strlen(_PATH_TTYOPT); *p != 0; ++p)
+ if (*p == '/')
+ *p = '.';
ret = options_from_file(path, 0, 0, 1);
free(path);
return ret;
option_error("%s option is disabled", opt->name);
return 0;
}
+ if ((opt->flags & OPT_PRIVFIX) && !privileged_option) {
+ struct option_info *ip = (struct option_info *) opt->addr2;
+ if (ip && ip->priv) {
+ option_error("%s option cannot be overridden", opt->name);
+ return 0;
+ }
+ }
switch (opt->type) {
case o_bool:
case o_string:
if (opt->flags & OPT_STATIC) {
- if (opt->upper_limit) {
- strncpy((char *)(opt->addr), *argv, opt->upper_limit);
- ((char *)(opt->addr))[opt->upper_limit-1] = 0;
- } else
- strcpy((char *)(opt->addr), *argv);
+ strlcpy((char *)(opt->addr), *argv, opt->upper_limit);
} else {
sv = strdup(*argv);
if (sv == NULL)
/*
* usage - print out a message telling how to use the program.
*/
-void
+static void
usage()
{
if (phase == PHASE_INITIALIZE)
va_start(args);
fmt = va_arg(args, char *);
#endif
- vfmtmsg(buf, sizeof(buf), fmt, args);
+ vslprintf(buf, sizeof(buf), fmt, args);
va_end(args);
if (phase == PHASE_INITIALIZE)
fprintf(stderr, "%s: %s\n", progname, buf);
syslog(LOG_ERR, "%s", buf);
}
+#if 0
/*
* readable - check if a file is readable by the real user.
*/
int fd;
{
uid_t uid;
- int ngroups, i;
+ int i;
struct stat sbuf;
- GIDSET_TYPE groups[NGROUPS_MAX];
uid = getuid();
if (uid == 0)
return sbuf.st_mode & S_IRUSR;
if (sbuf.st_gid == getgid())
return sbuf.st_mode & S_IRGRP;
- ngroups = getgroups(NGROUPS_MAX, groups);
for (i = 0; i < ngroups; ++i)
if (sbuf.st_gid == groups[i])
return sbuf.st_mode & S_IRGRP;
return sbuf.st_mode & S_IROTH;
}
+#endif
/*
* Read a word from a file.
/*
* number_option - parse an unsigned numeric parameter for an option.
*/
-int
+static int
number_option(str, valp, base)
char *str;
u_int32_t *valp;
l = strlen(arg) + strlen(_PATH_PEERFILES) + 1;
if ((fname = (char *) malloc(l)) == NULL)
novm("call file name");
- strcpy(fname, _PATH_PEERFILES);
- strcat(fname, arg);
+ slprintf(fname, l, "%s%s", _PATH_PEERFILES, arg);
ok = options_from_file(fname, 1, 1, 1);
return 0;
if (strncmp("/dev/", cp, 5) != 0) {
- strcpy(dev, "/dev/");
- strncat(dev, cp, MAXPATHLEN - 5);
- dev[MAXPATHLEN-1] = 0;
+ strlcpy(dev, "/dev/", sizeof(dev));
+ strlcat(dev, cp, sizeof(dev));
cp = dev;
}
return -1;
}
- (void) strncpy(devnam, cp, MAXPATHLEN);
- devnam[MAXPATHLEN-1] = 0;
- default_device = FALSE;
+ if (devnam_info.priv && !privileged_option) {
+ if (!quiet)
+ option_error("device name cannot be overridden");
+ return -1;
+ }
+
+ strlcpy(devnam, cp, sizeof(devnam));
+ default_device = 0;
devnam_info.priv = privileged_option;
devnam_info.source = option_source;
return -1;
} else {
remote = *(u_int32_t *)hp->h_addr;
- if (remote_name[0] == 0) {
- strncpy(remote_name, colon, MAXNAMELEN);
- remote_name[MAXNAMELEN-1] = 0;
- }
+ if (remote_name[0] == 0)
+ strlcpy(remote_name, colon, sizeof(remote_name));
}
}
if (bad_ip_adrs(remote)) {
projects / ppp.git / blobdiff