Deleted Added
sdiff udiff text old ( 42629 ) new ( 51292 )
full compact
conf.c (42629) conf.c (51292)
1/*
1/*
2 * Copyright (c) 1997-1998 Erez Zadok
2 * Copyright (c) 1997-1999 Erez Zadok
3 * Copyright (c) 1990 Jan-Simon Pendry
4 * Copyright (c) 1990 Imperial College of Science, Technology & Medicine
5 * Copyright (c) 1990 The Regents of the University of California.
6 * All rights reserved.
7 *
8 * This code is derived from software contributed to Berkeley by
9 * Jan-Simon Pendry at Imperial College, London.
10 *

--- 22 unchanged lines hidden (view full) ---

33 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
34 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
35 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
36 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
37 * SUCH DAMAGE.
38 *
39 * %W% (Berkeley) %G%
40 *
3 * Copyright (c) 1990 Jan-Simon Pendry
4 * Copyright (c) 1990 Imperial College of Science, Technology & Medicine
5 * Copyright (c) 1990 The Regents of the University of California.
6 * All rights reserved.
7 *
8 * This code is derived from software contributed to Berkeley by
9 * Jan-Simon Pendry at Imperial College, London.
10 *

--- 22 unchanged lines hidden (view full) ---

33 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
34 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
35 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
36 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
37 * SUCH DAMAGE.
38 *
39 * %W% (Berkeley) %G%
40 *
41 * $Id: conf.c,v 1.2 1998/12/27 06:24:46 ezk Exp $
41 * $Id: conf.c,v 1.4 1999/02/04 07:24:15 ezk Exp $
42 *
43 */
44
45/*
46 * Functions to handle the configuration file.
47 */
48
49#ifdef HAVE_CONFIG_H

--- 495 unchanged lines hidden (view full) ---

545
546
547static int
548gopt_mount_type(const char *val)
549{
550 if (STREQ(val, "autofs")) {
551#ifdef HAVE_FS_AUTOFS
552 gopt.flags |= CFM_MOUNT_TYPE_AUTOFS;
42 *
43 */
44
45/*
46 * Functions to handle the configuration file.
47 */
48
49#ifdef HAVE_CONFIG_H

--- 495 unchanged lines hidden (view full) ---

545
546
547static int
548gopt_mount_type(const char *val)
549{
550 if (STREQ(val, "autofs")) {
551#ifdef HAVE_FS_AUTOFS
552 gopt.flags |= CFM_MOUNT_TYPE_AUTOFS;
553 amd_use_autofs++;
553 return 0;
554#else /* not HAVE_FS_AUTOFS */
555 fprintf(stderr, "conf: no autofs support available\n");
556 return 1;
557#endif /* not HAVE_FS_AUTOFS */
558 } else if (STREQ(val, "nfs")) {
559 gopt.flags &= ~CFM_MOUNT_TYPE_AUTOFS;
560 return 0;

--- 301 unchanged lines hidden (view full) ---

862
863
864static int
865ropt_mount_type(const char *val, cf_map_t *cfm)
866{
867 if (STREQ(val, "autofs")) {
868#ifdef HAVE_FS_AUTOFS
869 cfm->cfm_flags |= CFM_MOUNT_TYPE_AUTOFS;
554 return 0;
555#else /* not HAVE_FS_AUTOFS */
556 fprintf(stderr, "conf: no autofs support available\n");
557 return 1;
558#endif /* not HAVE_FS_AUTOFS */
559 } else if (STREQ(val, "nfs")) {
560 gopt.flags &= ~CFM_MOUNT_TYPE_AUTOFS;
561 return 0;

--- 301 unchanged lines hidden (view full) ---

863
864
865static int
866ropt_mount_type(const char *val, cf_map_t *cfm)
867{
868 if (STREQ(val, "autofs")) {
869#ifdef HAVE_FS_AUTOFS
870 cfm->cfm_flags |= CFM_MOUNT_TYPE_AUTOFS;
871 amd_use_autofs++;
870 return 0;
871#else /* not HAVE_FS_AUTOFS */
872 fprintf(stderr, "conf: no autofs support available\n");
873 return 1;
874#endif /* not HAVE_FS_AUTOFS */
875 } else if (STREQ(val, "nfs")) {
876 cfm->cfm_flags &= ~CFM_MOUNT_TYPE_AUTOFS;
877 return 0;

--- 72 unchanged lines hidden --- 		872 return 0;
873#else /* not HAVE_FS_AUTOFS */
874 fprintf(stderr, "conf: no autofs support available\n");
875 return 1;
876#endif /* not HAVE_FS_AUTOFS */
877 } else if (STREQ(val, "nfs")) {
878 cfm->cfm_flags &= ~CFM_MOUNT_TYPE_AUTOFS;
879 return 0;

--- 72 unchanged lines hidden ---