update based on db90h's changes to the whiterussian package. note: this still needs...
[openwrt/svn-archive/archive.git] / net / openser / patches / sc.patch
1 --- openser-1.0.0-tls.orig/scripts/sc 2005-08-11 14:08:02.000000000 +0200
2 +++ openser-1.0.0-tls/scripts/sc 2006-01-29 02:18:43.319054456 +0100
3 @@ -48,11 +48,15 @@
4 STARTOPTIONS= # for example -dddd
5 fi
6 if [ -z "$DIR" ] ; then
7 - DIR=`dirname $0`
8 + DIR=/usr/sbin
9 fi
10 if [ -z "$SERBIN" ] ; then
11 SERBIN=$DIR/openser
12 fi
13 +if [ -z "$SIP_DOMAIN" ] ; then
14 + SIP_DOMAIN=$(nvram get sip_domain)
15 +fi
16 +
17
18 ##### ----------------------------------------------- #####
19 ### openser's FIFO server
20 @@ -415,7 +419,7 @@
21 fi
22
23 if [ -z "$SERDOMAIN" ] ; then
24 - echo "domain unknown: use usernames with domain or set default domain in SIP_DOMAIN"
25 + echo "domain unknown: use usernames with domain or set default domain in SIP_DOMAIN (with 'nvram set sip_domain=YOUR_SIP_DOMAIN')"
26 exit 1
27 fi
28 }
29 @@ -671,11 +675,7 @@
30 set_user $2
31 fifo_cmd ul_show_contact $USRLOC_TABLE "$SERUSER@$SERDOMAIN"
32 elif [ $# -eq 1 ] ; then
33 - printf "Dumping all contacts may take long: are you sure you want to proceed? [Y|N] " > /dev/stderr
34 - read answer
35 - if [ "$answer" = "y" -o "$answer" = "Y" ] ; then
36 - fifo_cmd ul_dump
37 - fi
38 + fifo_cmd ul_dump
39 else
40 echo "wrong number of params for usrloc show"
41 usage