Changeset 217

Show
Ignore:
Timestamp:
04/06/05 10:27:18 (4 years ago)
Author:
athomas
Message:

Updated man page, Change Log?; op.list.in now includes /etc/op.d. Default op.conf
will be much less complex.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • op/trunk/ChangeLog

    r213 r217  
    118118The xauth directive can now be given a target user, into whose environment the 
    119119X authentication information is imported. 
     120 
     12107/04/05 - op 1.26 
     122================== 
     123op will now read all config files in /etc/op.d with a .conf extension. This is 
     124a clean way of adding extra commands without having to manipulate op.conf. 
     125op.conf does not have to be present at all.  Useful for dropping in op config 
     126with other packages or when adding config to systems in bulk. Thanks to Kyle 
     127Hyland for this idea. 
     128 
     129Also made error reporting a bit smarter when config files are missing or have 
     130incorrect permissions.  
  • op/trunk/Makefile

    r215 r217  
    1212BINGRP= bin 
    1313BINMODE= 4755 
    14 INSTALL =install -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) op $(BINDIR) 
    1514MANOWN= bin 
    1615MANGRP= bin 
     
    1817MANEXT=1 
    1918MANDIR= $(DESTDIR)$(PREFIX)/share/man/man$(MANEXT) 
     19# Command to install binary and man page 
     20INSTALL =install -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) op $(BINDIR) 
    2021INSTALL-MAN =install -o $(MANOWN) -g $(MANGRP) -m $(MANMODE) op.$(MANEXT) $(MANDIR) 
    21 #GLOBALOPTS=-DDEBUG 
    22 
    23 # Linux with PAM 
    24 
    25 #OPTS= -DXAUTH=\"/usr/X11R6/bin/xauth\" -DUSE_PAM -DHAVE_SNPRINTF -g 
    26 #LDFLAGS = -g -lpam 
    27 
    28 # Linux without PAM (eg. Slackware) 
    29 
    30 OPTS= -DXAUTH=\"/usr/X11R6/bin/xauth\" -DHAVE_SNPRINTF -DUSE_SHADOW -g 
    31 
     22 
     23######################### USER CONFIGURABLE SECTION ########################### 
     24# Enable debugging 
     25OPTS += -g -DDEBUG 
     26LDFLAGS += -g 
     27 
     28# Enable PAM support 
     29#OPTS += -DUSE_PAM 
     30#LDFLAGS += -lpam 
     31 
     32# Enable shadow support (generally not used in conjunction with PAM) 
     33OPTS += -DUSE_SHADOW 
     34 
     35# Enable XAUTH support 
     36OPTS += -DXAUTH=\"/usr/X11R6/bin/xauth\" 
     37 
     38# We have snprintf(3) 
     39OPTS += -DHAVE_SNPRINTF 
     40 
     41############################ LEGACY CONFIG #################################### 
    3242# 
    3343# Solaris 2.x  - SunPro c compiler 
     
    7989        $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(LDFLAGS) $(SECURIDLIBDIR) $(OBJ) $(SECURIDLIB) $(LIBS) 
    8090clean: 
    81         rm -f $(OBJ) op core* lex.c \#* *~ 
    82 op.list: op.list.in 
     91        rm -f $(OBJ) op.list op core* lex.c \#* *~ 
     92op.list: defs.h op.list.in 
    8393        sed -e "s/@VERSION@/`grep VERSION defs.h | cut -d\\\" -f2`/" < op.list.in > op.list 
    8494install: op 
     
    93103 
    94104dist: clean 
    95         (V=`grep VERSION defs.h  | cut -d\" -f2`; rm -rf pkg; rm -f op-$$V.tar.gz; cd .. && mv op op-$$V && tar --exclude '.*.swp' --exclude '.svn' -czv -f op-$$V.tar.gz op-$$V && mv op-$$V op && mv op-$$V.tar.gz op) 
     105        (V=`grep VERSION defs.h  | cut -d\" -f2`; rm -rf pkg; rm -f op-$$V.tar.gz; cd .. && mv op op-$$V && tar --exclude 'op.list' --exclude '.*.swp' --exclude '.svn' -czv -f op-$$V.tar.gz op-$$V && mv op-$$V op && mv op-$$V.tar.gz op) 
  • op/trunk/op.1

    r213 r217  
    1616security-related aspects of environment of each 
    1717operation can be carefully controlled. 
     18.PP 
     19Configuration entries are read from 
     20.B /etc/op.conf 
     21and all files in 
     22.B /etc/op.d 
     23with the extension 
     24.B .conf. 
     25Files must be owned by 
     26.I root 
     27and not have 
     28.I group 
     29or 
     30.I other 
     31permissions set. 
    1832.PP  
    19 The fields of the entries in  
    20 .I op.conf  
    21 are separated by white space.  Each entry may span several lines and 
    22 continues until the next alphanumeric string is found at the beginning of 
    23 a lines (which is taken to be the next 
     33The fields of the entries in the configuration files are separated by white 
     34space.  Each entry may span several lines and continues until the next 
     35alphanumeric string is found at the beginning of a lines (which is taken to be 
     36the next 
    2437.I mnemonic or variable definition, 
    2538and thus the beginning of a new entry).  Comments may be embedded 
    26 beginning with a # character.  Each entry in op 
    27 .I op.conf 
    28 has the following form: 
     39beginning with a # character.  Each entry in the configuration files has the 
     40following form: 
    2941.RS 
    3042.DT 
     
    315327 
    316328.SH FILES 
    317 .DT 
    318 /etc/op.conf    access control description 
     329.TP 
     330.B /etc/op.conf 
     331Access control description file. 
     332.TP 
     333.B /etc/op.d/*.conf 
     334Access control description files. 
    319335.SH "SEE ALSO" 
    320 su(1), chroot(2), egrep(1) 
     336sudo(1), su(1), chroot(2), egrep(1) 
    321337.SH CREDIT 
    322338.B "Op: A flexible Tool for Restricted Superuser Access", 
     
    331347. 
    332348.SH BUG REPORTS TO 
    333 alec@korn.ch 
     349alec@swapoff.org 
    334350.SH COPYRIGHTS 
    335351\fB\(co\fR\s12 Copyright 1991 by David Koblas 
  • op/trunk/op.list.in

    r212 r217  
    1818 
    1919d 755 root sys /etc - 
     20d 755 root sys /etc/op.d - 
    2021c 600 root sys /etc/op.conf op.conf 
    2122