[37aaf89] | 1 | Description: Teach the *-conf tools about /usr/sbin. |
---|
| 2 | In the Debian djbdns binary packages, some programs and tools are |
---|
| 3 | located in the /usr/sbin directory, not in /usr/bin. |
---|
| 4 | Forwarded: not-needed |
---|
| 5 | Author: Peter Pentchev <roam@ringlet.net> |
---|
| 6 | Last-Update: 2020-07-26 |
---|
| 7 | |
---|
| 8 | --- a/axfrdns-conf.c |
---|
| 9 | +++ b/axfrdns-conf.c |
---|
| 10 | @@ -51,7 +51,7 @@ |
---|
| 11 | start("run"); |
---|
| 12 | outs("#!/bin/sh\nexec 2>&1\nexec envdir ./env sh -c '\n exec envuidgid "); outs(user); |
---|
| 13 | outs(" softlimit -d300000 tcpserver -vDRHl0 -x tcp.cdb -- \"$IP\" 53 "); |
---|
| 14 | - outs(auto_home); outs("/bin/axfrdns\n'\n"); |
---|
| 15 | + outs(auto_home); outs("/sbin/axfrdns\n'\n"); |
---|
| 16 | finish(); |
---|
| 17 | perm(0755); |
---|
| 18 | |
---|
| 19 | --- a/dnscache-conf.c |
---|
| 20 | +++ b/dnscache-conf.c |
---|
| 21 | @@ -123,7 +123,7 @@ |
---|
| 22 | seed_addtime(); start("run"); |
---|
| 23 | outs("#!/bin/sh\nexec 2>&1\nexec <seed\nexec envdir ./env sh -c '\n exec envuidgid "); outs(user); |
---|
| 24 | outs(" softlimit -o250 -d \"$DATALIMIT\" "); |
---|
| 25 | - outs(auto_home); outs("/bin/dnscache\n'\n"); finish(); |
---|
| 26 | + outs(auto_home); outs("/sbin/dnscache\n'\n"); finish(); |
---|
| 27 | seed_addtime(); perm(0755); |
---|
| 28 | seed_addtime(); start("log/run"); |
---|
| 29 | outs("#!/bin/sh\nexec setuidgid "); outs(loguser); |
---|
| 30 | --- a/rbldns-conf.c |
---|
| 31 | +++ b/rbldns-conf.c |
---|
| 32 | @@ -52,7 +52,7 @@ |
---|
| 33 | start("run"); |
---|
| 34 | outs("#!/bin/sh\nexec 2>&1\nexec envuidgid "); outs(user); |
---|
| 35 | outs(" envdir ./env softlimit -d250000 "); |
---|
| 36 | - outs(auto_home); outs("/bin/rbldns\n"); |
---|
| 37 | + outs(auto_home); outs("/sbin/rbldns\n"); |
---|
| 38 | finish(); |
---|
| 39 | perm(0755); |
---|
| 40 | |
---|
| 41 | @@ -63,7 +63,7 @@ |
---|
| 42 | perm(0644); |
---|
| 43 | start("root/Makefile"); |
---|
| 44 | outs("data.cdb: data\n"); |
---|
| 45 | - outs("\t"); outs(auto_home); outs("/bin/rbldns-data\n"); |
---|
| 46 | + outs("\t"); outs(auto_home); outs("/sbin/rbldns-data\n"); |
---|
| 47 | finish(); |
---|
| 48 | perm(0644); |
---|
| 49 | |
---|
| 50 | --- a/tinydns-conf.c |
---|
| 51 | +++ b/tinydns-conf.c |
---|
| 52 | @@ -47,7 +47,7 @@ |
---|
| 53 | start("run"); |
---|
| 54 | outs("#!/bin/sh\nexec 2>&1\nexec envuidgid "); outs(user); |
---|
| 55 | outs(" envdir ./env softlimit -d300000 "); |
---|
| 56 | - outs(auto_home); outs("/bin/tinydns\n"); |
---|
| 57 | + outs(auto_home); outs("/sbin/tinydns\n"); |
---|
| 58 | finish(); |
---|
| 59 | perm(0755); |
---|
| 60 | |
---|
| 61 | @@ -60,37 +60,37 @@ |
---|
| 62 | |
---|
| 63 | start("root/add-ns"); |
---|
| 64 | outs("#!/bin/sh\nexec "); |
---|
| 65 | - outs(auto_home); outs("/bin/tinydns-edit data data.new add ns ${1+\"$@\"}\n"); |
---|
| 66 | + outs(auto_home); outs("/sbin/tinydns-edit data data.new add ns ${1+\"$@\"}\n"); |
---|
| 67 | finish(); |
---|
| 68 | perm(0755); |
---|
| 69 | |
---|
| 70 | start("root/add-childns"); |
---|
| 71 | outs("#!/bin/sh\nexec "); |
---|
| 72 | - outs(auto_home); outs("/bin/tinydns-edit data data.new add childns ${1+\"$@\"}\n"); |
---|
| 73 | + outs(auto_home); outs("/sbin/tinydns-edit data data.new add childns ${1+\"$@\"}\n"); |
---|
| 74 | finish(); |
---|
| 75 | perm(0755); |
---|
| 76 | |
---|
| 77 | start("root/add-host"); |
---|
| 78 | outs("#!/bin/sh\nexec "); |
---|
| 79 | - outs(auto_home); outs("/bin/tinydns-edit data data.new add host ${1+\"$@\"}\n"); |
---|
| 80 | + outs(auto_home); outs("/sbin/tinydns-edit data data.new add host ${1+\"$@\"}\n"); |
---|
| 81 | finish(); |
---|
| 82 | perm(0755); |
---|
| 83 | |
---|
| 84 | start("root/add-alias"); |
---|
| 85 | outs("#!/bin/sh\nexec "); |
---|
| 86 | - outs(auto_home); outs("/bin/tinydns-edit data data.new add alias ${1+\"$@\"}\n"); |
---|
| 87 | + outs(auto_home); outs("/sbin/tinydns-edit data data.new add alias ${1+\"$@\"}\n"); |
---|
| 88 | finish(); |
---|
| 89 | perm(0755); |
---|
| 90 | |
---|
| 91 | start("root/add-mx"); |
---|
| 92 | outs("#!/bin/sh\nexec "); |
---|
| 93 | - outs(auto_home); outs("/bin/tinydns-edit data data.new add mx ${1+\"$@\"}\n"); |
---|
| 94 | + outs(auto_home); outs("/sbin/tinydns-edit data data.new add mx ${1+\"$@\"}\n"); |
---|
| 95 | finish(); |
---|
| 96 | perm(0755); |
---|
| 97 | |
---|
| 98 | start("root/Makefile"); |
---|
| 99 | outs("data.cdb: data\n"); |
---|
| 100 | - outs("\t"); outs(auto_home); outs("/bin/tinydns-data\n"); |
---|
| 101 | + outs("\t"); outs(auto_home); outs("/sbin/tinydns-data\n"); |
---|
| 102 | finish(); |
---|
| 103 | perm(0644); |
---|
| 104 | |
---|
| 105 | --- a/walldns-conf.c |
---|
| 106 | +++ b/walldns-conf.c |
---|
| 107 | @@ -47,7 +47,7 @@ |
---|
| 108 | start("run"); |
---|
| 109 | outs("#!/bin/sh\nexec 2>&1\nexec envuidgid "); outs(user); |
---|
| 110 | outs(" envdir ./env softlimit -d250000 "); |
---|
| 111 | - outs(auto_home); outs("/bin/walldns\n"); |
---|
| 112 | + outs(auto_home); outs("/sbin/walldns\n"); |
---|
| 113 | finish(); |
---|
| 114 | perm(0755); |
---|
| 115 | |
---|