diff options
| author |   Bjørn Mork <bjorn@mork.no> | 2015-05-15 10:25:07 +0200 |
|---|---|---|
| committer | Bjørn Mork <bjorn@mork.no> | 2015-05-15 10:25:07 +0200 |
| commit | 35294332b2e75151b4b614719ee6522e1afd8748 (patch) | |
| tree | fde51b865f9a08ebd3ef87bc382dec5bb165f4c9 /include | |
| parent | 02013228914a1d17e8df15d4e2b7950469395a5c (diff) | |
ripe-atlas-fw: imported version 45504550
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Diffstat (limited to 'include')
| -rw-r--r-- | include/applets.h | 2 | ||||
| -rw-r--r-- | include/libbb.h | 3 | ||||
| -rw-r--r-- | include/usage.h | 9 |
3 files changed, 13 insertions, 1 deletions
diff --git a/include/applets.h b/include/applets.h index eb1495e..128d8d9 100644 --- a/include/applets.h +++ b/include/applets.h @@ -149,6 +149,7 @@ USE_EPERD(APPLET(eperd, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)) USE_ETHER_WAKE(APPLET_ODDNAME(ether-wake, ether_wake, _BB_DIR_USR_BIN, _BB_SUID_NEVER, ether_wake)) USE_EVHTTPGET(APPLET(evhttpget, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_EVPING(APPLET(evping, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) +USE_EVSSLGETCERT(APPLET(evsslgetcert, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_EVTDIG(APPLET(evtdig, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_EVTRACEROUTE(APPLET(evtraceroute, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_EXPAND(APPLET(expand, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) @@ -319,6 +320,7 @@ USE_MODPROBE_SMALL(APPLET_ODDNAME(rmmod, modprobe, _BB_DIR_SBIN, _BB_SUID_NEVER, USE_ROUTE(APPLET(route, _BB_DIR_SBIN, _BB_SUID_NEVER)) USE_RPM(APPLET(rpm, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_RPTRA6(APPLET(rptra6, _BB_DIR_BIN, _BB_SUID_NEVER)) +USE_RPTADDR6(APPLET(rptaddr6, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_RPM2CPIO(APPLET(rpm2cpio, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_RTCWAKE(APPLET(rtcwake, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, _BB_DIR_BIN, _BB_SUID_NEVER, run_parts)) diff --git a/include/libbb.h b/include/libbb.h index 1231b31..229634d 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -302,7 +302,7 @@ extern char *bb_get_last_path_component_strip(char *path) FAST_FUNC; /* "abc/def/" -> "" and it never modifies 'path' */ extern char *bb_get_last_path_component_nostrip(const char *path) FAST_FUNC; -/* What's the best place for this? */ +/* What's the best place for this? AA may be atlas_probe.h */ #define ATLAS_HOME "/home/atlas" #define ATLAS_CRONS ATLAS_HOME "/crons" #define ATLAS_STATUS ATLAS_HOME "/status" @@ -312,6 +312,7 @@ extern char *bb_get_last_path_component_nostrip(const char *path) FAST_FUNC; #define ATLAS_TIMESYNC_FILE ATLAS_STATUS "/timesync.vol" extern int validate_filename(const char *path, const char *prefix); +extern int validate_atlas_id(const char *atlas_id); int ndelay_on(int fd) FAST_FUNC; int ndelay_off(int fd) FAST_FUNC; diff --git a/include/usage.h b/include/usage.h index 2fd5953..5870924 100644 --- a/include/usage.h +++ b/include/usage.h @@ -1055,6 +1055,11 @@ "\n -6 IPv6" \ "todo" +#define evsslgetcert_trivial_usage \ + "todo" +#define evsslgetcert_full_usage "\n\n" \ + "todo" + #define evtraceroute_trivial_usage \ "todo" #define evtraceroute_full_usage "\n\n" \ @@ -3546,6 +3551,10 @@ #define rptra6_trivial_usage \ +#define rptaddr6_full_usage "\n\n" \ + +#define rptaddr6_trivial_usage \ + #define rptra6_full_usage "\n\n" \ #define rtcwake_trivial_usage \ |