| amfs_auto.c (82794) | amfs_auto.c (119679) |
|---|---|
| 1/* | 1/* |
| 2 * Copyright (c) 1997-2001 Erez Zadok | 2 * Copyright (c) 1997-2003 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: amfs_auto.c,v 1.9.2.7 2001/04/14 21:08:19 ezk Exp $ | 41 * $Id: amfs_auto.c,v 1.9.2.11 2003/07/18 04:50:18 ezk Exp $ |
| 42 * 43 */ 44 45/* 46 * Automount file system 47 */ 48 49#ifdef HAVE_CONFIG_H --- 133 unchanged lines hidden (view full) --- 183 * Use the name of this node. 184 * 185 * That means if you want no prefix you must say so 186 * in the map. 187 */ 188 if (mf->mf_fo->opt_pref) { 189 /* allow pref:=null to set a real null prefix */ 190 if (STREQ(mf->mf_fo->opt_pref, "null")) { | 42 * 43 */ 44 45/* 46 * Automount file system 47 */ 48 49#ifdef HAVE_CONFIG_H --- 133 unchanged lines hidden (view full) --- 183 * Use the name of this node. 184 * 185 * That means if you want no prefix you must say so 186 * in the map. 187 */ 188 if (mf->mf_fo->opt_pref) { 189 /* allow pref:=null to set a real null prefix */ 190 if (STREQ(mf->mf_fo->opt_pref, "null")) { |
| 191 mp->am_pref = ""; | 191 mp->am_pref = strdup(""); |
| 192 } else { 193 /* 194 * the prefix specified as an option 195 */ 196 mp->am_pref = strdup(mf->mf_fo->opt_pref); 197 } 198 } else { 199 /* --- 229 unchanged lines hidden (view full) --- 429 /* 430 * Mount it! 431 */ 432 error = mount_node(mp); 433 434#ifdef DEBUG 435 if (error > 0) { 436 errno = error; | 192 } else { 193 /* 194 * the prefix specified as an option 195 */ 196 mp->am_pref = strdup(mf->mf_fo->opt_pref); 197 } 198 } else { 199 /* --- 229 unchanged lines hidden (view full) --- 429 /* 430 * Mount it! 431 */ 432 error = mount_node(mp); 433 434#ifdef DEBUG 435 if (error > 0) { 436 errno = error; |
| 437 dlog("amfs_auto call to mount_node failed: %m"); | 437 dlog("amfs_auto: call to mount_node(%s) failed: %m", mp->am_path); |
| 438 } 439#endif /* DEBUG */ 440 441 return error; 442} 443 444 445/* --- 1193 unchanged lines hidden --- | 438 } 439#endif /* DEBUG */ 440 441 return error; 442} 443 444 445/* --- 1193 unchanged lines hidden --- |