diff options
| author | Didier Raboud <odyx@debian.org> | 2016-08-09 18:11:24 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2018-03-28 08:50:12 +0200 |
| commit | e2380d5c885cccec883812350748730a9eef58f5 (patch) | |
| tree | aea75f1879b1067ab9e89f9d4e1239e96fa91046 | |
| parent | c23be11e7a2fd8a2c34929413c611c8d48027d25 (diff) | |
Move cupsd.conf.default from SERVERROOT to DATADIR
Origin: vendor
Bug: https://cups.org/str.php?L4342
Bug-Debian: http://bugs.debian.org/640124
Last-Update: 2015-02-10
Patch-Name: move-cupsd-conf-default-to-share.patch
| -rw-r--r-- | cgi-bin/admin.c | 6 | ||||
| -rw-r--r-- | conf/Makefile | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c index f788083fb..0ba791b48 100644 --- a/cgi-bin/admin.c +++ b/cgi-bin/admin.c @@ -1630,6 +1630,7 @@ do_config_server(http_t *http) /* I - HTTP connection */ int ch; /* Character from file */ char filename[1024]; /* Filename */ const char *server_root; /* Location of config files */ + const char *data_dir; /* Location of data files */ /* @@ -1713,7 +1714,10 @@ do_config_server(http_t *http) /* I - HTTP connection */ * well... */ - strlcat(filename, ".default", sizeof(filename)); + if ((data_dir = getenv("CUPS_DATADIR")) == NULL) + data_dir = CUPS_DATADIR; + + snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir); if (!stat(filename, &info) && info.st_size < (1024 * 1024) && (cupsd = cupsFileOpen(filename, "r")) != NULL) diff --git a/conf/Makefile b/conf/Makefile index e249e6069..42a123f75 100644 --- a/conf/Makefile +++ b/conf/Makefile @@ -70,7 +70,7 @@ install-data: else \ $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \ fi ; \ - $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \ + $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \ done $(INSTALL_DIR) -m 755 $(DATADIR)/mime for file in $(REPLACE); do \ @@ -118,9 +118,10 @@ install-libs: # uninstall: - for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \ + for file in $(KEEP) $(REPLACE); do \ $(RM) $(SERVERROOT)/$$file; \ done + $(RM) $(DATADIR)/cupsd.conf.default -$(RMDIR) $(SERVERROOT) for file in $(REPLACE); do \ $(RM) $(DATADIR)/mime/$$file; \ |