diff options
| author | Colin Watson <cjwatson@debian.org> | 2004-03-01 02:25:32 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2004-03-01 02:25:32 +0000 |
| commit | ea8116a11e3de70036dbc665ccb0d486cf89cac9 (patch) | |
| tree | d73ccdff78d8608e156465af42e6a1b3527fb2d6 /openbsd-compat/setproctitle.c | |
| parent | e39b311381a5609cc05acf298c42fba196dc524b (diff) | |
| parent | f5bda272678ec6dccaa5f29379cf60cb855018e8 (diff) | |
Merge 3.8p1 to the trunk. This builds and runs, but I haven't tested it
extensively yet.
ProtocolKeepAlives is now just a compatibility alias for
ServerAliveInterval.
Diffstat (limited to 'openbsd-compat/setproctitle.c')
| -rw-r--r-- | openbsd-compat/setproctitle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openbsd-compat/setproctitle.c b/openbsd-compat/setproctitle.c index b41100fc6..6e2b19bb4 100644 --- a/openbsd-compat/setproctitle.c +++ b/openbsd-compat/setproctitle.c | |||
| @@ -41,8 +41,8 @@ | |||
| 41 | #endif | 41 | #endif |
| 42 | 42 | ||
| 43 | #define SPT_NONE 0 /* don't use it at all */ | 43 | #define SPT_NONE 0 /* don't use it at all */ |
| 44 | #define SPT_PSTAT 1 /* cover argv with title information */ | 44 | #define SPT_PSTAT 1 /* use pstat(PSTAT_SETCMD, ...) */ |
| 45 | #define SPT_REUSEARGV 2 /* use pstat(PSTAT_SETCMD, ...) */ | 45 | #define SPT_REUSEARGV 2 /* cover argv with title information */ |
| 46 | 46 | ||
| 47 | #ifndef SPT_TYPE | 47 | #ifndef SPT_TYPE |
| 48 | # define SPT_TYPE SPT_NONE | 48 | # define SPT_TYPE SPT_NONE |