diff options
| author | W. Michael Petullo <mike@flyn.org> | 2019-04-11 18:00:50 -0400 |
|---|---|---|
| committer | W. Michael Petullo <mike@flyn.org> | 2019-04-11 21:13:54 -0400 |
| commit | acc42e945115b729851b59ab69793c19485ba96a (patch) | |
| tree | 889118be147da68b26b4183790c4b90e4babf5ce | |
| parent | b463bc9d784df1679bbe56cf99742459aea21364 (diff) | |
krb5: allow installing without kadmind
Signed-off-by: W. Michael Petullo <mike@flyn.org>
| -rw-r--r-- | net/krb5/Makefile | 23 | ||||
| -rw-r--r-- | net/krb5/files/krb5kdc | 4 |
2 files changed, 18 insertions, 9 deletions
diff --git a/net/krb5/Makefile b/net/krb5/Makefile index fd1e86b37..d72e29d2e 100644 --- a/net/krb5/Makefile +++ b/net/krb5/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=krb5 PKG_VERSION:=1.17 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> @@ -50,6 +50,12 @@ define Package/krb5-server TITLE:=Kerberos 5 Server endef +define Package/krb5-server-extras + $(call Package/krb5/Default) + DEPENDS:=+krb5-libs +libpthread + TITLE:=Kerberos 5 Admin Server +endef + define Package/krb5-client $(call Package/krb5/Default) DEPENDS:=+krb5-libs @@ -124,22 +130,25 @@ endef define Package/krb5-server/install $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/krb5kdc $(1)/etc/init.d/krb5kdc -# $(INSTALL_DIR) $(1)/usr/bin -# $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sclient $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kadmin.local $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kadmind $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kdb5_util $(1)/usr/sbin -# $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kprop $(1)/usr/sbin -# $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kpropd $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/krb5kdc $(1)/usr/sbin -# $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/sim_server $(1)/usr/sbin +endef + +define Package/krb5-server-extras/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kadmind $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kprop $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kpropd $(1)/usr/sbin endef define Package/krb5-server/postinst +mkdir -p $${IPKG_INSTROOT}/etc/krb5kdc touch $${IPKG_INSTROOT}/etc/krb5kdc/kadm5.acl endef $(eval $(call BuildPackage,krb5-libs)) $(eval $(call BuildPackage,krb5-server)) +$(eval $(call BuildPackage,krb5-server-extras)) $(eval $(call BuildPackage,krb5-client)) diff --git a/net/krb5/files/krb5kdc b/net/krb5/files/krb5kdc index dec7188e9..fd428c933 100644 --- a/net/krb5/files/krb5kdc +++ b/net/krb5/files/krb5kdc @@ -10,10 +10,10 @@ start() { [ -f /etc/krb5kdc/principal ] || ( echo; echo ) | kdb5_util create -s /usr/sbin/krb5kdc - /usr/sbin/kadmind + [ -x /usr/sbin/kadmind ] && /usr/sbin/kadmind } stop() { killall krb5kdc 2> /dev/null - killall kadmind 2> /dev/null + [ -x /usr/sbin/kadmind ] && killall kadmind 2> /dev/null } |