[Git][NTPsec/ntpsec][master] 2 commits: Remove prefixdir from docs/asciidoc.conf and friends

[Hal Murray]

Hal Murray pushed to branch master at NTPsec / ntpsec


Commits:
d2ea85b4 by Hal Murray at 2018-01-03T01:02:37-08:00
Remove prefixdir from docs/asciidoc.conf and friends

It was only used by docs/includes/ntpkeygen-body.txt
and that is being removed.

- - - - -
086dd875 by Hal Murray at 2018-01-03T01:05:51-08:00
Another bool

- - - - -


5 changed files:

- INSTALL
- docs/asciidoc.conf
- docs/build.txt
- include/ntp_stdlib.h
- libntp/authkeys.c


Changes:

=====================================
INSTALL
=====================================
--- a/INSTALL
+++ b/INSTALL
@@ -192,10 +192,6 @@ By default, `waf install' will install the package's files in
 installation prefix other than `/usr/local' by giving waf the
 option `--prefix=PATH'.
 
-If you do so, please also modify the prefixdir variable in
-docs/asciidoc.conf, so that the documentation is built pointing
-to your new location.
-
 You should read the section "Path problems with the test tools" in
 devel/testing.txt before setting a non-default prefix.
 


=====================================
docs/asciidoc.conf
=====================================
--- a/docs/asciidoc.conf
+++ b/docs/asciidoc.conf
@@ -25,7 +25,4 @@ ntptimeman=ntptime(8)
 ntpwaitman=ntpwait(8)
 ntpdigman=ntpdig(1)
 ntpvizman=ntpviz(1)
-# This is to help distribution packagers
-# Change this to match install paths, and then build documentation
-prefixdir=/usr/local
 


=====================================
docs/build.txt
=====================================
--- a/docs/build.txt
+++ b/docs/build.txt
@@ -67,10 +67,6 @@ configures the build process accordingly. Use the +./waf build+ command to
 compile and link the distribution and the +./waf install+ command to install
 the executables by default in +/usr/local/bin+.
 
-NOTE: Distribution packagers: If you modify the prefix parameter to
-+waf+ to install the executables, please also modify the +prefixdir+ parameter
-in +asciidoc.conf+ to the same value.
-
 [[conf]]
 == Configuration ==
 


=====================================
include/ntp_stdlib.h
=====================================
--- a/include/ntp_stdlib.h
+++ b/include/ntp_stdlib.h
@@ -40,7 +40,7 @@ extern	void	setup_logfile	(const char *);
 
 /* authkeys.c */
 extern	void	auth_delkeys	(void);
-extern	int	authdecrypt	(keyid_t, uint32_t *, int, int);
+extern	bool	authdecrypt	(keyid_t, uint32_t *, int, int);
 extern	int	authencrypt	(keyid_t, uint32_t *, int);
 extern	bool	authhavekey	(keyid_t);
 extern	bool	authistrusted	(keyid_t);
@@ -67,7 +67,7 @@ int ntp_getopt(int argc, char *const argv[], const char *optstring);
 int ntp_getopt_long(int argc, char* const argv[], const char *optstring,
 		    const struct option *longopts, int *longindex);
 
-/* a_md5encrypt.c */
+/* mac_md5encrypt.c */
 extern	bool	mac_authdecrypt	(int, uint8_t *, uint32_t *, int, int);
 extern	int	mac_authencrypt	(int, uint8_t *, uint32_t *, int);
 extern	void	mac_setkey	(keyid_t, int, const uint8_t *, size_t);


=====================================
libntp/authkeys.c
=====================================
--- a/libntp/authkeys.c
+++ b/libntp/authkeys.c
@@ -563,7 +563,7 @@ authencrypt(
  *
  * Returns true if authenticator valid, false if invalid or not found.
  */
-int
+bool
 authdecrypt(
 	keyid_t		keyno,
 	uint32_t *	pkt,



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/314e716f466d16fdced510522006a56450200e5b...086dd87590faab8bd554d72fa3903919e1f0f675

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/314e716f466d16fdced510522006a56450200e5b...086dd87590faab8bd554d72fa3903919e1f0f675
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20180103/fd538b3a/attachment.html>