FreeNAS

Revision: 11856
          http://freenas.svn.sourceforge.net/freenas/?rev=11856&view=rev
Author:   zippybr
Date:     2012-07-09 13:07:04 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
Add stdout and stderr fields to cronjob

Optionally redirect them to /dev/null, it is desired to output errors
so root can be notified.


Conflicts:
	nanobsd/Files/etc/rc.d/ix-crontab

Modified Paths:
--------------
    branches/8.2.0/gui/system/models.py
    branches/8.2.0/nanobsd/Files/etc/rc.d/ix-crontab

Added Paths:
-----------
    branches/8.2.0/gui/system/migrations/0042_auto__add_field_cronjob_cron_stdout__add_field_cronjob_cron_stderr.py

Added: branches/8.2.0/gui/system/migrations/0042_auto__add_field_cronjob_cron_stdout__add_field_cronjob_cron_stderr.py
===================================================================
--- branches/8.2.0/gui/system/migrations/0042_auto__add_field_cronjob_cron_stdout__add_field_cronjob_cron_stderr.py	                        (rev 0)
+++ branches/8.2.0/gui/system/migrations/0042_auto__add_field_cronjob_cron_stdout__add_field_cronjob_cron_stderr.py	2012-07-09 13:07:04 UTC (rev 11856)
@@ -0,0 +1,179 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Adding field 'CronJob.cron_stdout'
+        db.add_column('system_cronjob', 'cron_stdout', self.gf('django.db.models.fields.BooleanField')(default=1), keep_default=False)
+
+        # Adding field 'CronJob.cron_stderr'
+        db.add_column('system_cronjob', 'cron_stderr', self.gf('django.db.models.fields.BooleanField')(default=0), keep_default=False)
+
+
+    def backwards(self, orm):
+        
+        # Deleting field 'CronJob.cron_stdout'
+        db.delete_column('system_cronjob', 'cron_stdout')
+
+        # Deleting field 'CronJob.cron_stderr'
+        db.delete_column('system_cronjob', 'cron_stderr')
+
+
+    models = {
+        'storage.disk': {
+            'Meta': {'ordering': "['disk_name']", 'object_name': 'Disk'},
+            'disk_acousticlevel': ('django.db.models.fields.CharField', [], {'default': "'Disabled'", 'max_length': '120'}),
+            'disk_advpowermgmt': ('django.db.models.fields.CharField', [], {'default': "'Disabled'", 'max_length': '120'}),
+            'disk_description': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'disk_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'disk_hddstandby': ('django.db.models.fields.CharField', [], {'default': "'Always On'", 'max_length': '120'}),
+            'disk_identifier': ('django.db.models.fields.CharField', [], {'max_length': '42'}),
+            'disk_multipath_member': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'disk_multipath_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'disk_name': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'disk_serial': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'disk_smartoptions': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'disk_togglesmart': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'disk_transfermode': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'system.advanced': {
+            'Meta': {'object_name': 'Advanced'},
+            'adv_advancedmode': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'adv_autotune': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'adv_consolemenu': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'adv_consolemsg': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'adv_consolescreensaver': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'adv_firmwarevc': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'adv_motd': ('django.db.models.fields.TextField', [], {'max_length': '1024'}),
+            'adv_powerdaemon': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'adv_serialconsole': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'adv_swapondrive': ('django.db.models.fields.IntegerField', [], {'default': '2'}),
+            'adv_systembeep': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'adv_traceback': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'adv_tuning': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'adv_zeroconfbonjour': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'system.cronjob': {
+            'Meta': {'ordering': "['cron_description', 'cron_user']", 'object_name': 'CronJob'},
+            'cron_command': ('django.db.models.fields.TextField', [], {}),
+            'cron_daymonth': ('django.db.models.fields.CharField', [], {'default': "'*'", 'max_length': '100'}),
+            'cron_dayweek': ('django.db.models.fields.CharField', [], {'default': "'1,2,3,4,5,6,7'", 'max_length': '100'}),
+            'cron_description': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
+            'cron_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'cron_hour': ('django.db.models.fields.CharField', [], {'default': "'*'", 'max_length': '100'}),
+            'cron_minute': ('django.db.models.fields.CharField', [], {'default': "'00'", 'max_length': '100'}),
+            'cron_month': ('django.db.models.fields.CharField', [], {'default': "'1,2,3,4,5,6,7,8,9,a,b,c'", 'max_length': '100'}),
+            'cron_stderr': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cron_stdout': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'cron_user': ('freenasUI.freeadmin.models.UserField', [], {'max_length': '60'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'system.email': {
+            'Meta': {'object_name': 'Email'},
+            'em_fromemail': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '120'}),
+            'em_outgoingserver': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'em_pass': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'em_port': ('django.db.models.fields.IntegerField', [], {'default': '25'}),
+            'em_security': ('django.db.models.fields.CharField', [], {'default': "'plain'", 'max_length': '120'}),
+            'em_smtp': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'em_user': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'system.ntpserver': {
+            'Meta': {'ordering': "['ntp_address']", 'object_name': 'NTPServer'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ntp_address': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ntp_burst': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ntp_iburst': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'ntp_maxpoll': ('django.db.models.fields.IntegerField', [], {'default': '10'}),
+            'ntp_minpoll': ('django.db.models.fields.IntegerField', [], {'default': '6'}),
+            'ntp_prefer': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'system.rsync': {
+            'Meta': {'ordering': "['rsync_path', 'rsync_desc']", 'object_name': 'Rsync'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'rsync_archive': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'rsync_compress': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'rsync_daymonth': ('django.db.models.fields.CharField', [], {'default': "'*'", 'max_length': '100'}),
+            'rsync_dayweek': ('django.db.models.fields.CharField', [], {'default': "'1,2,3,4,5,6,7'", 'max_length': '100'}),
+            'rsync_delete': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'rsync_desc': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'rsync_direction': ('django.db.models.fields.CharField', [], {'default': "'push'", 'max_length': '10'}),
+            'rsync_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'rsync_extra': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsync_hour': ('django.db.models.fields.CharField', [], {'default': "'*'", 'max_length': '100'}),
+            'rsync_minute': ('django.db.models.fields.CharField', [], {'default': "'00'", 'max_length': '100'}),
+            'rsync_mode': ('django.db.models.fields.CharField', [], {'default': "'module'", 'max_length': '20'}),
+            'rsync_month': ('django.db.models.fields.CharField', [], {'default': "'1,2,3,4,5,6,7,8,9,a,b,c'", 'max_length': '100'}),
+            'rsync_path': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255'}),
+            'rsync_preserveattr': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'rsync_preserveperm': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'rsync_quiet': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'rsync_recursive': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'rsync_remotehost': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'rsync_remotemodule': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'rsync_remotepath': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'rsync_remoteport': ('django.db.models.fields.SmallIntegerField', [], {'default': '22'}),
+            'rsync_times': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'rsync_user': ('freenasUI.freeadmin.models.UserField', [], {'max_length': '60'})
+        },
+        'system.settings': {
+            'Meta': {'object_name': 'Settings'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'stg_guiaddress': ('django.db.models.fields.CharField', [], {'default': "'0.0.0.0'", 'max_length': '120', 'blank': 'True'}),
+            'stg_guiport': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '120', 'blank': 'True'}),
+            'stg_guiprotocol': ('django.db.models.fields.CharField', [], {'default': "'http'", 'max_length': '120'}),
+            'stg_kbdmap': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'stg_language': ('django.db.models.fields.CharField', [], {'default': "'en'", 'max_length': '120'}),
+            'stg_syslogserver': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '120', 'blank': 'True'}),
+            'stg_timezone': ('django.db.models.fields.CharField', [], {'default': "'America/Los_Angeles'", 'max_length': '120'})
+        },
+        'system.smarttest': {
+            'Meta': {'ordering': "['smarttest_type']", 'object_name': 'SMARTTest'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'smarttest_daymonth': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'smarttest_dayweek': ('django.db.models.fields.CharField', [], {'default': "'1,2,3,4,5,6,7'", 'max_length': '100'}),
+            'smarttest_desc': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'smarttest_disks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['storage.Disk']", 'symmetrical': 'False'}),
+            'smarttest_hour': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'smarttest_month': ('django.db.models.fields.CharField', [], {'default': "'1,2,3,4,5,6,7,8,9,10,a,b,c'", 'max_length': '100'}),
+            'smarttest_type': ('django.db.models.fields.CharField', [], {'max_length': '2'})
+        },
+        'system.ssl': {
+            'Meta': {'object_name': 'SSL'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ssl_certfile': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'ssl_city': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'ssl_common': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'ssl_country': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'ssl_email': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'ssl_org': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'ssl_state': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'ssl_unit': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'})
+        },
+        'system.sysctl': {
+            'Meta': {'ordering': "['sysctl_mib']", 'object_name': 'Sysctl'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'sysctl_comment': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'sysctl_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'sysctl_mib': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '50'}),
+            'sysctl_value': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'system.tunable': {
+            'Meta': {'ordering': "['tun_var']", 'object_name': 'Tunable'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'tun_comment': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'tun_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'tun_value': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'tun_var': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '50'})
+        }
+    }
+
+    complete_apps = ['system']

Modified: branches/8.2.0/gui/system/models.py
===================================================================
--- branches/8.2.0/gui/system/models.py	2012-07-09 12:59:19 UTC (rev 11855)
+++ branches/8.2.0/gui/system/models.py	2012-07-09 13:07:04 UTC (rev 11856)
@@ -365,6 +365,18 @@
             default="1,2,3,4,5,6,7",
             verbose_name=_("Day of week"),
             )
+    cron_stdout = models.BooleanField(
+            default=True,
+            verbose_name=_("Redirect Stdout"),
+            help_text=_("Redirect the standard output to /dev/null. In other "
+                "words, disable output."),
+            )
+    cron_stderr = models.BooleanField(
+            default=False,
+            verbose_name=_("Redirect Stderr"),
+            help_text=_("Redirect the standard error output to /dev/null. In "
+                "other words, disable error output."),
+            )
     cron_enabled = models.BooleanField(
             default=True,
             verbose_name=_("Enabled"),

Modified: branches/8.2.0/nanobsd/Files/etc/rc.d/ix-crontab
===================================================================
--- branches/8.2.0/nanobsd/Files/etc/rc.d/ix-crontab	2012-07-09 12:59:19 UTC (rev 11855)
+++ branches/8.2.0/nanobsd/Files/etc/rc.d/ix-crontab	2012-07-09 13:07:04 UTC (rev 11856)
@@ -12,7 +12,7 @@
 generate_crontab()
 {
 	local IFS="|"
-	local f="cron_minute cron_hour cron_daymonth cron_month cron_dayweek cron_user cron_command"
+	local f="cron_minute cron_hour cron_daymonth cron_month cron_dayweek cron_user cron_command cron_stdout cron_stderr"
 	eval local $f
 	local sf=$(var_to_sf $f)
 	local cron_PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/root/bin"
@@ -23,8 +23,15 @@
 	while eval read -r $f; do
 		# Note that echo -e will do the wrong thing with certain characters. Read the commit
 		# history for more details.
-		echo "${cron_minute}	${cron_hour}	${cron_daymonth}	${cron_month}	${cron_dayweek}	${cron_user}	PATH=\"$cron_PATH\" ${cron_command} >/dev/null 2>&1" >> /etc/crontab
-	done
+		echo -n "${cron_minute}	${cron_hour}	${cron_daymonth}	${cron_month}	${cron_dayweek}	${cron_user}	PATH=\"$cron_PATH\" ${cron_command}"
+		if [ ${cron_stdout} -eq 1 ]; then
+			echo -n " > /dev/null"
+		fi
+		if [ ${cron_stderr} -eq 1 ]; then
+			echo -n " 2> /dev/null"
+		fi
+		echo
+	done >> /etc/crontab
 
 	local f="rsync_path rsync_mode rsync_minute rsync_hour rsync_daymonth rsync_month rsync_dayweek rsync_user rsync_remotehost rsync_remotemodule rsync_remotepath rsync_direction rsync_recursive rsync_times rsync_compress rsync_archive rsync_delete rsync_quiet rsync_preserveperm rsync_preserveattr rsync_extra"
 	eval local $f

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11918
          http://freenas.svn.sourceforge.net/freenas/?rev=11918&view=rev
Author:   jpaetzel
Date:     2012-07-18 00:08:41 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
MFC 11917:

Fix a few bugs in the installer that were preventing upgrades from working.

Modified Paths:
--------------
    branches/8.2.0/build/files/install.sh
    branches/8.2.0/nanobsd/Installer/lib/functions.sh

Property Changed:
----------------
    branches/8.2.0/


Property changes on: branches/8.2.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819
   + /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917

Modified: branches/8.2.0/build/files/install.sh
===================================================================
--- branches/8.2.0/build/files/install.sh	2012-07-18 00:05:55 UTC (rev 11917)
+++ branches/8.2.0/build/files/install.sh	2012-07-18 00:08:41 UTC (rev 11918)
@@ -197,7 +197,9 @@
         # ah my old friend, the can't see the mount til I access the mountpoint
         # bug
         ls /tmp/data_old > /dev/null
-        cp -p /tmp/data_old/conf/base/etc/hostid /tmp/
+	if [ -f /tmp/data_old/conf/base/etc/hostid ]; then
+            cp -p /tmp/data_old/conf/base/etc/hostid /tmp/
+	fi
         if [ -d /tmp/data_old/root/.ssh ]; then
             cp -pR /tmp/data_old/root/.ssh /tmp/
         fi
@@ -215,11 +217,6 @@
     fi
     rmdir /tmp/data_old
 
-    if [ -f /tmp/hostid ]; then
-        return 0
-    else
-        return 1
-    fi
 }
 
 menu_install()
@@ -301,13 +298,14 @@
         /etc/rc.d/dmesg start
         mkdir /tmp/data
         mount /dev/${_disk}s1a /tmp/data
+	ls /tmp/data > /dev/null
         # pre-avatar.conf build. Convert it!
-        if [ ! -e /tmp/data/etc/avatar.conf ]
+        if [ ! -e /tmp/data/conf/base/etc/avatar.conf ]
         then
             upgrade_version_to_avatar_conf \
-		    /tmp/data/etc/version* \
+		    /tmp/data/conf/base/etc/version* \
 		    /etc/avatar.conf \
-		    /tmp/data/etc/avatar.conf
+		    /tmp/data/conf/base/etc/avatar.conf
         fi
         install_worker.sh -D /tmp/data -m / pre-install
         umount /tmp/data
@@ -338,7 +336,9 @@
         # Mount: /
         mount /dev/${_disk}s1a /tmp/data
         ls /tmp/data > /dev/null
-        cp -p /tmp/hostid /tmp/data/conf/base/etc
+	if [ -f /tmp/hostid ]; then
+            cp -p /tmp/hostid /tmp/data/conf/base/etc
+	fi
         if [ -d /tmp/.ssh ]; then
             cp -pR /tmp/.ssh /tmp/data/root/
         fi

Modified: branches/8.2.0/nanobsd/Installer/lib/functions.sh
===================================================================
--- branches/8.2.0/nanobsd/Installer/lib/functions.sh	2012-07-18 00:05:55 UTC (rev 11917)
+++ branches/8.2.0/nanobsd/Installer/lib/functions.sh	2012-07-18 00:08:41 UTC (rev 11918)
@@ -49,6 +49,56 @@
 	return 1
 }
 
+# Phases in a release cycle sorted in chronological order.
+#
+# See rewrite_release_phases for more details.
+readonly RELEASE_PHASES="
+ALPHA
+BETA
+RC
+PRERELEASE
+RELEASE
+"
+
+# In order for sort(1) to do the right thing with release versions below, we
+# need to remap the "release phases" (ALPHA, BETA, RC, PRERELEASE, RELEASE) to
+# their respective numeric stages in the release cycle so the numeric sort will
+# succeed.
+#
+# This function also sanity checks that the version string matches the expected
+# release phase format.
+#
+# Parameters:
+# 1 - version string to rewrite
+rewrite_release_phases()
+{
+	local i
+	local version_string
+	local version_string_old
+
+	version_string=$1
+	version_string_old=$1
+
+	i=0
+	set -- $RELEASE_PHASES
+	while [ $# -gt 0 ]
+	do
+		version_string=$(echo "$version_string" | sed -e "s/$1/$i./")
+		shift
+		: $(( i += 1 ))
+	done
+
+	# Sanity check
+	if [ $version_string = $version_string_old ]
+	then
+		error "version string was unexpected ($version_string).
+
+It must contain one of the following strings:
+$RELEASE_PHASES"
+	fi
+	echo $version_string
+}
+
 # Compare two arbitrary versions to return whether or not one is newer than
 # the other.
 #
@@ -81,6 +131,9 @@
 		return 0
 	fi
 
+	version1=$(rewrite_release_phases $version1)
+	version2=$(rewrite_release_phases $version2)
+
 	unsorted="$version1 $version2"
 	# Magic sort fu required for 9.0.0 vs 10.0.0, etc.
 	sorted=$(echo -n $unsorted | tr ' ' '\n' | sort -k 1 -f '-' -n | tr '\n' ' ')

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11930
          http://freenas.svn.sourceforge.net/freenas/?rev=11930&view=rev
Author:   jpaetzel
Date:     2012-07-18 17:22:18 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
MFC 11929:

Set sysctls before importing any ZFS pools.

This is needed for setting sysctls that ZFS reads at import time,
such as the tuning needed for fusion-i/o L2ARC devices.

Modified Paths:
--------------
    branches/8.2.0/nanobsd/Files/etc/rc.d/ix-sysctl

Property Changed:
----------------
    branches/8.2.0/


Property changes on: branches/8.2.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917
   + /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929

Modified: branches/8.2.0/nanobsd/Files/etc/rc.d/ix-sysctl
===================================================================
--- branches/8.2.0/nanobsd/Files/etc/rc.d/ix-sysctl	2012-07-18 17:17:32 UTC (rev 11929)
+++ branches/8.2.0/nanobsd/Files/etc/rc.d/ix-sysctl	2012-07-18 17:22:18 UTC (rev 11930)
@@ -5,6 +5,7 @@
 
 # PROVIDE: ix-sysctl
 # REQUIRE: ix-update sysctl
+# BEFORE: ix-zfs
 
 . /etc/rc.subr
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11942
          http://freenas.svn.sourceforge.net/freenas/?rev=11942&view=rev
Author:   jpaetzel
Date:     2012-07-19 23:11:31 +0000 (Thu, 19 Jul 2012)
Log Message:
-----------
It's time to change the name, as well as switch off debug output in the installer
and upgrade scripts.

Modified Paths:
--------------
    branches/8.2.0/build/files/install.sh
    branches/8.2.0/build/nano_env
    branches/8.2.0/nanobsd/Files/root/update

Modified: branches/8.2.0/build/files/install.sh
===================================================================
--- branches/8.2.0/build/files/install.sh	2012-07-19 15:32:33 UTC (rev 11941)
+++ branches/8.2.0/build/files/install.sh	2012-07-19 23:11:31 UTC (rev 11942)
@@ -285,7 +285,6 @@
 
     # Start critical section.
     trap "set +x; read -p \"The $AVATAR_PROJECT $_action on $_disk has failed. Press any key to continue.. \" junk" EXIT
-    set -ex
 
     #  _disk, _image, _config_file
     # we can now build a config file for pc-sysinstall

Modified: branches/8.2.0/build/nano_env
===================================================================
--- branches/8.2.0/build/nano_env	2012-07-19 15:32:33 UTC (rev 11941)
+++ branches/8.2.0/build/nano_env	2012-07-19 23:11:31 UTC (rev 11942)
@@ -119,7 +119,7 @@
 NANO_LABEL="FreeNAS"
 
 # Version of the software.
-VERSION="8.2.0-RC1"
+VERSION="8.2.0-RELEASE"
 
 # Image name, e.g. FreeNAS-8.1-r7609-amd64 or FreeNAS-8.0.1-RC1-i386, see
 # nanobsd/freenas-common:last_orders().

Modified: branches/8.2.0/nanobsd/Files/root/update
===================================================================
--- branches/8.2.0/nanobsd/Files/root/update	2012-07-19 15:32:33 UTC (rev 11941)
+++ branches/8.2.0/nanobsd/Files/root/update	2012-07-19 23:11:31 UTC (rev 11942)
@@ -30,8 +30,6 @@
 #	ssh somewhere cat image.s1 | sh update
 #
 
-set -e
-
 . /etc/nanobsd.conf
 
 if mount | grep ${NANO_DRIVE}s1 > /dev/null ; then

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11948
          http://freenas.svn.sourceforge.net/freenas/?rev=11948&view=rev
Author:   jpaetzel
Date:     2012-07-20 21:29:22 +0000 (Fri, 20 Jul 2012)
Log Message:
-----------
MFC 11947:

Remove the circular dependancy that r11929 introduced, which prevents
the system from importing pools at boot.

Revision Links:
--------------
    http://freenas.svn.sourceforge.net/freenas/?rev=11929&view=rev

Modified Paths:
--------------
    branches/8.2.0/nanobsd/Files/etc/rc.d/ix-sysctl

Property Changed:
----------------
    branches/8.2.0/


Property changes on: branches/8.2.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929
   + /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947

Modified: branches/8.2.0/nanobsd/Files/etc/rc.d/ix-sysctl
===================================================================
--- branches/8.2.0/nanobsd/Files/etc/rc.d/ix-sysctl	2012-07-20 21:27:48 UTC (rev 11947)
+++ branches/8.2.0/nanobsd/Files/etc/rc.d/ix-sysctl	2012-07-20 21:29:22 UTC (rev 11948)
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: ix-sysctl
-# REQUIRE: ix-update sysctl
+# REQUIRE: ix-update
 # BEFORE: ix-zfs
 
 . /etc/rc.subr

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12073
          http://freenas.svn.sourceforge.net/freenas/?rev=12073&view=rev
Author:   jpaetzel
Date:     2012-08-10 16:31:25 +0000 (Fri, 10 Aug 2012)
Log Message:
-----------
MFC 12072:

Add additional snmp mibs.

Modified Paths:
--------------
    branches/8.2.0/nanobsd/Files/etc/rc.d/ix-bsnmpd

Property Changed:
----------------
    branches/8.2.0/


Property changes on: branches/8.2.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947
   + /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12072

Modified: branches/8.2.0/nanobsd/Files/etc/rc.d/ix-bsnmpd
===================================================================
--- branches/8.2.0/nanobsd/Files/etc/rc.d/ix-bsnmpd	2012-08-10 16:15:52 UTC (rev 12072)
+++ branches/8.2.0/nanobsd/Files/etc/rc.d/ix-bsnmpd	2012-08-10 16:31:25 UTC (rev 12073)
@@ -58,6 +58,7 @@
 sysDescr = \$(description)
 
 begemotSnmpdModulePath."mibII" = "/usr/lib/snmp_mibII.so"
+begemotSnmpdModulePath."hostres" = "/usr/lib/snmp_hostres.so"
 EOF
 	done
 	${FREENAS_SQLITE_CMD} ${FREENAS_CONFIG} "SELECT snmp_options FROM services_snmp ORDER BY -id LIMIT 1" >> ${bsnmp_config}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12104
          http://freenas.svn.sourceforge.net/freenas/?rev=12104&view=rev
Author:   jhixson
Date:     2012-08-16 00:08:09 +0000 (Thu, 16 Aug 2012)
Log Message:
-----------
Bring in jail upgrade code from trunk. Hopefully I didn't bork things.

Modified Paths:
--------------
    branches/8.2.0/gui/middleware/notifier.py
    branches/8.2.0/nanobsd/Files/etc/rc.d/ix-ldap

Added Paths:
-----------
    branches/8.2.0/nanobsd/Files/root/pbi.sh

Property Changed:
----------------
    branches/8.2.0/


Property changes on: branches/8.2.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12072
   + /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093

Modified: branches/8.2.0/gui/middleware/notifier.py
===================================================================
--- branches/8.2.0/gui/middleware/notifier.py	2012-08-15 17:55:33 UTC (rev 12103)
+++ branches/8.2.0/gui/middleware/notifier.py	2012-08-16 00:08:09 UTC (rev 12104)
@@ -2294,6 +2294,7 @@
 
         #
         # XXX: At some point (soon), plugins/jail need to support IPv6
+	# XXX: I agree.
         #
         pj = PluginsJail()
         pj.jail_name = jail_name

Modified: branches/8.2.0/nanobsd/Files/etc/rc.d/ix-ldap
===================================================================
--- branches/8.2.0/nanobsd/Files/etc/rc.d/ix-ldap	2012-08-15 17:55:33 UTC (rev 12103)
+++ branches/8.2.0/nanobsd/Files/etc/rc.d/ix-ldap	2012-08-16 00:08:09 UTC (rev 12104)
@@ -228,16 +228,19 @@
 		if [ "${ldap_anonbind}" = "0" ]
 		then
 			local temp=$(mktemp /tmp/tmp.XXXXXX)
+			local cmdfile=$(mktemp /tmp/tmp.XXXXXX)
+			local cmd
 		
 			chmod 400 "${temp}"
 			echo -n "${ldap_rootbindpw}" > "${temp}"
 
-			local out=$(${ldapwhoami} ${options} -D "${ldap_rootbasedn}" -y "${temp}")
+			echo ${ldapwhoami} ${options} -D "'${ldap_rootbasedn}'" -y "${temp}" > "${cmdfile}"
+			cmd=$(cat ${cmdfile})
+			out=$(eval ${cmd})
 			res=$?
 
-			rm -f "${temp}"
+			rm -f "${temp}" "${cmdfile}"
 			local dn=$(echo "${out}"|cut -f2 -d:)
-
 			if [ "${dn}" != "${ldap_rootbasedn}" ]
 			then
 				res=1

Copied: branches/8.2.0/nanobsd/Files/root/pbi.sh (from rev 12085, trunk/nanobsd/Files/root/pbi.sh)
===================================================================
--- branches/8.2.0/nanobsd/Files/root/pbi.sh	                        (rev 0)
+++ branches/8.2.0/nanobsd/Files/root/pbi.sh	2012-08-16 00:08:09 UTC (rev 12104)
@@ -0,0 +1,320 @@
+#!/bin/sh
+
+pbi_add=/usr/local/sbin/pbi_add
+pbi_info=/usr/local/sbin/pbi_info
+pbi_create=/usr/local/sbin/pbi_create
+
+backupdir=/mnt/plugins/pbibackup
+logfile=/tmp/pbi.log
+
+usage()
+{
+	echo "$(basename $0) <pbibackup|pbirestore|jailupdate> [arguments] ..."
+	exit 1
+}
+
+get_plugins_path()
+{
+	. /etc/rc.freenas
+
+	${FREENAS_SQLITE_CMD} ${FREENAS_CONFIG} "
+	SELECT
+		plugins_path
+	FROM
+		services_pluginsjail
+	"
+}
+
+get_plugins_jail_name()
+{
+	. /etc/rc.freenas
+
+	${FREENAS_SQLITE_CMD} ${FREENAS_CONFIG} "
+	SELECT
+		jail_name
+	FROM
+		services_pluginsjail
+	"
+}
+
+get_plugins_jail_path()
+{
+	. /etc/rc.freenas
+
+	${FREENAS_SQLITE_CMD} ${FREENAS_CONFIG} "
+	SELECT
+		jail_path || '/' || jail_name
+	FROM
+		services_pluginsjail
+	"
+}
+
+jail_stop()
+{
+	. /etc/rc.freenas
+
+	local jail=$(get_plugins_jail_name)
+	if [ -z "${jail}" ]
+	then
+		return 1
+	fi
+
+	/etc/rc.d/jail stop ${jail}
+	return $?
+}
+
+jail_status()
+{
+	. /etc/rc.freenas
+
+	local jail="$(get_plugins_jail_name)"
+	if [ -z "${jail}" ]
+	then
+		return 1
+	fi
+
+	local jid="$(jls|awk "\$3 ~ /${jailname}/"|awk '{ print $1 }')"
+	if [ -z "${jid}" ]
+	then
+		return 1
+	fi
+
+	return 0
+}
+
+jail_start()
+{
+	. /etc/rc.freenas
+
+	local jail=$(get_plugins_jail_name)
+	if [ -z "${jail}" ]
+	then
+		return 1
+	fi
+
+	/etc/rc.d/ix-jail start
+	/etc/rc.d/jail start ${jail}
+	return $?
+}
+
+jail_context()
+{
+	local op="$1"
+	shift
+	local args="$*"
+
+	#
+	# Bail if we're already running within jail context.
+	#
+	if [ "${JAIL_CONTEXT}" = "1" ]
+	then
+		return 0
+	fi
+
+	local jailpath=$(get_plugins_jail_path)
+	if [ -z "${jailpath}" -o ! -d "${jailpath}" ]
+	then
+		return 1
+	fi
+
+	#
+	# /root inside the jail is where we copy ourselves.
+	#
+	local root=${jailpath}/root
+	if [ -z "${root}" -o ! -d "${root}" ]
+	then
+		return 1
+	fi
+
+	local self="$(basename $0)"
+	local this="${root}/${self}"
+	local script="/root/${self}"
+
+	#
+	# Do the copy and fail if not successful, otherwise everything else borks.
+	#
+	cp "$0" "${root}"
+	if [ -z "${this}" ]
+	then
+		return 1
+	fi
+
+	local jailname=$(get_plugins_jail_name)
+	if [ -z "${jailname}" ]
+	then
+		return 1
+	fi
+
+	#
+	# Get the jail id using the jail name we just got.
+	#
+	local jid=$(jls|awk "\$3 ~ /${jailname}/"|awk '{ print $1 }')
+	if [ -z "${jid}" ]
+	then
+		return 1
+	fi
+
+	#
+	# Setup environment variable so we know if we're running inside the jail
+	#
+	export JAIL_CONTEXT=1
+
+	#
+	# Now run the command within the jail!
+	#
+	jexec "${jid}" "${script}" "${op}" "${args}"
+
+
+	#
+	# We've done our business, now clean up!
+	#
+	unset JAIL_CONTEXT
+	return $?
+}
+
+in_jail_context()
+{
+	if [ "${JAIL_CONTEXT}" = "1" ]
+	then
+		return 0
+	fi
+
+	return 1
+}
+
+pbi_backup()
+{
+	local pbis="$*"
+	local ret=0
+
+	jail_context pbibackup "${pbis}" >> "${logfile}" 2>&1
+	if [ "$?" != "0" ]
+	then
+		return 1
+	fi
+
+	if ! in_jail_context
+	then
+		return 0
+	fi
+
+	if [ -z "${pbis}" ]
+	then
+		pbis="$(${pbi_info})"
+	fi
+
+	mkdir -p ${backupdir}
+	for pbi in ${pbis}
+	do
+		${pbi_create} -o "${backupdir}" -b "${pbi}"
+		if [ "$?" != "0" ]
+		then
+			ret=1
+		fi
+	done
+
+	return ${ret}
+}
+
+pbi_restore()
+{
+	local pbis="$*"
+	local ret=0
+
+	jail_context pbirestore "${pbis}" >> "${logfile}" 2>&1
+	if [ "$?" != "0" ]
+	then
+		return 1
+	fi
+
+	if ! in_jail_context
+	then
+		return 0
+	fi
+
+	if [ -z "${pbis}" ]
+	then
+		pbis=$(ls ${backupdir}/*.pbi 2>&1)
+	fi
+
+	for pbi in ${pbis}
+	do
+		${pbi_add} -f --no-checksig "${pbi}"
+		if [ "$?" != "0" ]
+		then
+			ret=1
+		fi
+	done
+
+	return ${ret}
+}
+
+jail_update()
+{
+	local pbi="${1}"
+	if [ -z "${pbi}" -o ! -f "${pbi}" ]
+	then
+		return 1
+	fi
+
+	local jailpath=$(get_plugins_jail_path)
+	if [ -z "${jailpath}" -o ! -d "${jailpath}" ]
+	then
+		return 1
+	fi
+
+	jail_status
+	local on="$?"
+	if [ "${on}" = "0" ]
+	then
+		jail_stop
+	fi
+
+	#
+	# Secret voodoo to coerce pbi_add into doing exactly what we want,
+	# how we want, and WHERE we want... muahahah!
+	#
+	export PBI_ALTEXTRACT_PATH="${jailpath}"
+	${pbi_add} -e -f --no-checksig "${pbi}" >> "${logfile}" 2>&1
+
+	if [ "${on}" = "0" ]
+	then
+		jail_start
+	fi
+
+	return $?
+}
+
+
+main()
+{
+	if [ $# -lt 1 ]
+	then
+		usage
+	fi
+
+	local op="$1"
+	shift
+	local args="$*"
+
+	: > "${logfile}"
+
+	op=$(echo ${op}|tr A-Z a-z)
+	case ${op} in
+		pbibackup)
+			pbi_backup ${args}
+			;;
+		pbirestore)
+			pbi_restore ${args}
+			;;
+		jailupdate)
+			jail_update ${args}
+			;;
+		*)
+			usage
+			;;
+	esac
+}
+
+
+main $*

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12117
          http://freenas.svn.sourceforge.net/freenas/?rev=12117&view=rev
Author:   jhixson
Date:     2012-08-17 03:34:05 +0000 (Fri, 17 Aug 2012)
Log Message:
-----------
ACL fixes from trunk

Modified Paths:
--------------
    branches/8.2.0/gui/middleware/notifier.py
    branches/8.2.0/gui/tools/winacl.sh

Property Changed:
----------------
    branches/8.2.0/


Property changes on: branches/8.2.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093
   + /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116

Modified: branches/8.2.0/gui/middleware/notifier.py
===================================================================
--- branches/8.2.0/gui/middleware/notifier.py	2012-08-16 23:30:46 UTC (rev 12116)
+++ branches/8.2.0/gui/middleware/notifier.py	2012-08-17 03:34:05 UTC (rev 12117)
@@ -1808,12 +1808,22 @@
             open(winacl, 'a').close()
         elif acl == 'unix' and winexists:
             os.unlink(winacl)
+       
+        if winexists:
+            script = "/usr/local/www/freenasUI/tools/winacl.sh"
+            args=" -o '%s' -g '%s' -d %s " % (user, group, mode)
+            if recursive:
+                args += " -r "
+            args += " -p %s" % path
+            cmd = "%s %s" % (script, args)
+            self.__system(cmd)
 
-        hier = ACL_Hierarchy(path)
-        hier.set_defaults(recursive=recursive)
-        hier.chown(user + ":" + group, recursive)
-        hier.chmod(mode, recursive)
-        hier.close()
+        else:
+            flags = ""
+            if recursive:
+                flags = "-R"
+            self.__system("/usr/sbin/chown %s %s:%s %s" % (flags, user, group, path))
+            self.__system("/bin/chmod %s%s %s" % (flags, mode, path))
 
     def mp_get_permission(self, path):
         if os.path.isdir(path):

Modified: branches/8.2.0/gui/tools/winacl.sh
===================================================================
--- branches/8.2.0/gui/tools/winacl.sh	2012-08-16 23:30:46 UTC (rev 12116)
+++ branches/8.2.0/gui/tools/winacl.sh	2012-08-17 03:34:05 UTC (rev 12117)
@@ -26,28 +26,31 @@
 #
 #####################################################################
 
-MAGIC="WINACL"
-VFUNC=":"
-
 usage()
 {
 	cat <<-__EOF__
 	Usage: $0 [options] ...
 	Where option is:
-	    -o owner
-	    -g group
-	    -d directory
+	    -o <owner>
+	    -g <group>
+	    -p <path>
+	    -f <filemode>
+	    -d <directorymode>
+	    -r
 	    -v
 __EOF__
 
 	exit 1
 }
 
+get_version()
+{
+	uname -r | cut -f1 -d.
+}
 
 winacl_reset()
 {
-	local path="${1}"
-	local func="${2}"
+	local path="${WINACL_PATH}"
 
 	local owner_access
 	local owner_inherit
@@ -87,90 +90,214 @@
 	local group_entry="group@..."
 	local everyone_entry="everyone@..."
 
-	${func} "${path}"
-	setfacl -b "${path}"
-	for i in $(jot 5)
+	${WINACL_VFUNC} "${path}"
+	eval "setfacl -b ${path}"
+
+	eval "setfacl -a 0 ${group_entry} ${path}"
+	eval "setfacl -a 1 ${everyone_entry} ${path}"
+	eval "setfacl -a 2 ${owner_entry} ${path}"
+
+	local count="$(eval getfacl ${path}|awk '{ print $1 }'|grep -v '^#'|wc -l|xargs)"
+	for i in $(jot ${count} 0)
 	do
-		setfacl -x 0 "${path}"
+		if [ ${i} -gt 2 ]
+		then
+			eval "setfacl -x 3 ${path}"
+		fi
 	done
+}
 
-	setfacl -a 0 "${group_entry}" "${path}"
-	setfacl -a 1 "${everyone_entry}" "${path}"
-	setfacl -a 2 "${owner_entry}" "${path}"
-	setfacl -x 3 "${path}"
+
+change_acls()
+{
+	${WINACL_VFUNC} "find ${WINACL_PATH} \( -type f -o -type d \) -exec $0 -d {} \;"
+	eval "find ${WINACL_PATH} \( -type f -o -type d \) -exec $0 -p {} \;"
+	return $?
 }
 
-reset_permissions()
+
+_change_owner()
 {
-	local dir="${1}"
+	${WINACL_VFUNC} chown ${WINACL_FLAGS} ${WINACL_OWNER} ${WINACL_PATH}
+	eval "chown ${WINACL_FLAGS} ${WINACL_OWNER} ${WINACL_PATH}"
+	return $?
+}
 
-	${VFUNC} find "${dir}" \( -type f -o -type d \) -exec $0 ${MAGIC} {} \;
-	find "${dir}" \( -type f -o -type d \) -exec $0 ${MAGIC} {} \;
+
+_change_group()
+{
+	${WINACL_VFUNC} chgrp ${WINACL_FLAGS} ${WINACL_GROUP} ${WINACL_PATH}
+	eval "chgrp ${WINACL_FLAGS} ${WINACL_GROUP} ${WINACL_PATH}"
 	return $?
 }
 
-main()
+
+_change_owner_group()
 {
-	local owner
-	local group
-	local dir
-	local verbose="0"
+	${WINACL_VFUNC} chown ${WINACL_FLAGS} ${WINACL_OWNER}:${WINACL_GROUP} ${WINACL_PATH}
+	eval "chown ${WINACL_FLAGS} ${WINACL_OWNER}:${WINACL_GROUP} ${WINACL_PATH}"
+	return $?
+}
 
-	local magic="${1}"
-	local path="${2}"
 
-	if [ "${magic}" = "${MAGIC}" -o "${magic}" = "${MAGIC}_v" -a -e "${path}" ]
+change_owner_group()
+{
+	if [ -n "${WINACL_OWNER}" -a -n "${WINACL_GROUP}" ]
 	then
-		if [ "${magic}" = "${MAGIC}_v" ]
-		then
-			VFUNC="echo"
-		fi
+		_change_owner_group
 
-		winacl_reset "${path}" "${VFUNC}"
-		return 0
+	elif [ -n "${WINACL_OWNER}" ]
+	then
+		_change_owner
 
-	elif [ "$#" -lt "2" ]
+	elif [ -n "${WINACL_GROUP}" ]
 	then
+		_change_group
+	fi
+}
+
+change_permissions()
+{
+	if [ -n "${WINACL_FMODE}" -a -n "${WINACL_DMODE}" ]
+	then
+		${WINACL_VFUNC} "find ${WINACL_PATH} \
+			\( -type f -a -exec chmod ${WINACL_FLAGS} ${WINACL_FMODE} {} \; \) -o \
+			\( -type d -a -exec chmod ${WINACL_FLAGS} ${WINACL_DMODE} {} \; \)"
+		eval "find ${WINACL_PATH} \
+			\( -type f -a -exec chmod ${WINACL_FLAGS} ${WINACL_FMODE} {} \; \) -o \
+			\( -type d -a -exec chmod ${WINACL_FLAGS} ${WINACL_DMODE} {} \; \)"
+
+	elif [ -n "${WINACL_DMODE}" ]
+	then
+		${WINACL_VFUNC} "find ${WINACL_PATH} \
+			\( -type d -a -exec chmod ${WINACL_FLAGS} ${WINACL_DMODE} {} \; \)"
+		eval "find ${WINACL_PATH} \
+			\( -type d -a -exec chmod ${WINACL_FLAGS} ${WINACL_DMODE} {} \; \)"
+
+	elif [ -n "${WINACL_FMODE}" ]
+	then	
+		${WINACL_VFUNC} "find ${WINACL_PATH} \
+			\( -type f -a -exec chmod ${WINACL_FLAGS} ${WINACL_FMODE} {} \; \)"
+		eval "find ${WINACL_PATH} \
+			\( -type f -a -exec chmod ${WINACL_FLAGS} ${WINACL_FMODE} {} \; \)"
+
+	fi
+
+	return $?
+}
+
+main()
+{
+	local owner
+	local group
+	local path 
+	local fmode
+	local dmode
+	local major
+	local verbose=0
+	local recursive=0
+
+	if [ "$#" -lt "2" ]
+	then
 		usage
 	fi
 
-	while getopts "o:g:d:v" opt
+	while getopts "o:g:p:f:d:rv" opt
 	do
 		case "${opt}" in 
 			o) owner="${OPTARG}" ;;
 			g) group="${OPTARG}" ;;
-			d) dir="${OPTARG}" ;;
+			p) path="${OPTARG}" ;;
+			f) fmode="${OPTARG}" ;;
+			d) dmode="${OPTARG}" ;;
+			r) recursive=1 ;;
 			v) verbose=1 ;;
 			:|\?) usage ;;
 		esac
 	done
 
-	local flags="-R"
+	WINACL_PATH="'${path}'"
+	if [ -z "${path}" ]
+	then
+		usage
+	fi
+	export WINACL_PATH
+
+	major=$(get_version)
+
+	if [ "${CHANGE_ACLS}" = "1" ]
+	then
+		winacl_reset
+	fi
+
+	WINACL_OWNER=""
+	if [ -n "${owner}" ]
+	then
+		WINACL_OWNER="'${owner}'"
+	fi
+	export WINACL_OWNER
+
+	WINACL_GROUP=""
+	if [ -n "${group}" ]
+	then
+		WINACL_GROUP="'${group}'"
+	fi
+	export WINACL_GROUP
+
+	WINACL_FMODE="0664"
+	if [ -n "${fmode}" ]
+	then
+		WINACL_FMODE="${fmode}"
+	fi
+	export WINACL_FMODE
+
+	WINACL_DMODE="0775"
+	if [ -n "${dmode}" ]
+	then
+		WINACL_DMODE="${dmode}"
+	fi
+	export WINACL_DMODE
+
+	WINACL_VFUNC=":"
+	if [ "${verbose}" = "1" ] 
+	then
+		WINACL_VFUNC="echo"
+	fi
+	export WINACL_VFUNC
+
+	WINACL_FLAGS=""		
+	if [ "${recursive}" = "1" ]
+	then
+		WINACL_FLAGS="-R"
+	fi
+
 	if [ "${verbose}" = "1" ]
 	then
-		MAGIC="${MAGIC}_v"
-		VFUNC="echo"
-		flags="-Rvv"
+		WINACL_VFUNC="echo"
+		WINACL_FLAGS="${WINACL_FLAGS} -vv"
 	fi
+	export WINACL_VFUNC WINACL_FLAGS
 
-	if [ -n "${owner}" -a -n "${group}" ]
+	change_owner_group
+	if [ "${major}" -le "8" ]
 	then
-		${VFUNC} chown "${flags}" "${owner}:${group}" "${dir}"
-		chown "${flags}" "${owner}:${group}" "${dir}"
+		change_permissions
+	fi
 
-	elif [ -n "${owner}" ]
+	if [ "${recursive}" = "1" ]
 	then
-		${VFUNC} chown "${flags}" "${owner}" "${dir}"
-		chown "${flags}" "${owner}" "${dir}"
+		export CHANGE_ACLS=1 
+		change_acls
+	else
+		export CHANGE_ACLS=0
+		winacl_reset
+	fi
 
-	elif [ -n "${group}" ]
+	if [ "${major}" -gt "8" ]
 	then
-		${VFUNC} chgrp "${flags}" "${group}" "${dir}"
-		chgrp "${flags}" "${group}" "${dir}"
+		change_permissions
 	fi
-
-	reset_permissions "${dir}"
-	return $?
 }
 
+
 main "$@"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12132
          http://freenas.svn.sourceforge.net/freenas/?rev=12132&view=rev
Author:   jhixson
Date:     2012-08-19 00:32:30 +0000 (Sun, 19 Aug 2012)
Log Message:
-----------
acl bufix from trunk

Modified Paths:
--------------
    branches/8.2.0/gui/middleware/notifier.py

Property Changed:
----------------
    branches/8.2.0/


Property changes on: branches/8.2.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116
   + /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131

Modified: branches/8.2.0/gui/middleware/notifier.py
===================================================================
--- branches/8.2.0/gui/middleware/notifier.py	2012-08-19 00:29:46 UTC (rev 12131)
+++ branches/8.2.0/gui/middleware/notifier.py	2012-08-19 00:32:30 UTC (rev 12132)
@@ -1806,8 +1806,10 @@
         winexists = (ACL.get_acl_ostype(path) == ACL_FLAGS_OS_WINDOWS)
         if acl == 'windows' and not winexists:
             open(winacl, 'a').close()
+            winexists = True
         elif acl == 'unix' and winexists:
             os.unlink(winacl)
+            winexists = False
        
         if winexists:
             script = "/usr/local/www/freenasUI/tools/winacl.sh"
@@ -1822,8 +1824,8 @@
             flags = ""
             if recursive:
                 flags = "-R"
-            self.__system("/usr/sbin/chown %s %s:%s %s" % (flags, user, group, path))
-            self.__system("/bin/chmod %s%s %s" % (flags, mode, path))
+            self.__system("/usr/sbin/chown %s '%s':'%s' '%s'" % (flags, user, group, path))
+            self.__system("/bin/chmod %s%s '%s'" % (flags, mode, path))
 
     def mp_get_permission(self, path):
         if os.path.isdir(path):

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12138
          http://freenas.svn.sourceforge.net/freenas/?rev=12138&view=rev
Author:   jhixson
Date:     2012-08-20 20:40:33 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
MFC: 12137 (dig fix)

Modified Paths:
--------------
    branches/8.2.0/nanobsd/Files/etc/rc.freenas

Property Changed:
----------------
    branches/8.2.0/


Property changes on: branches/8.2.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131
   + /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137

Modified: branches/8.2.0/nanobsd/Files/etc/rc.freenas
===================================================================
--- branches/8.2.0/nanobsd/Files/etc/rc.freenas	2012-08-20 20:38:05 UTC (rev 12137)
+++ branches/8.2.0/nanobsd/Files/etc/rc.freenas	2012-08-20 20:40:33 UTC (rev 12138)
@@ -114,7 +114,7 @@
 	local host="${1}"
 	local tmpfile="$(mktemp -q /var/tmp/.adfooXXXXXX)"
 
-	dig -t srv +short "${host}" | sort -n +0 +1 > "${tmpfile}"
+	dig -t srv +short "${host}" | egrep -v '^;;' | sort -n +0 +1 > "${tmpfile}"
 
 	exec 3<&0
 	exec 0<"${tmpfile}"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12140
          http://freenas.svn.sourceforge.net/freenas/?rev=12140&view=rev
Author:   jhixson
Date:     2012-08-20 20:53:55 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
MFC 12139 - The better way to leave out comments

Modified Paths:
--------------
    branches/8.2.0/nanobsd/Files/etc/rc.freenas

Property Changed:
----------------
    branches/8.2.0/


Property changes on: branches/8.2.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137
   + /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137,12139

Modified: branches/8.2.0/nanobsd/Files/etc/rc.freenas
===================================================================
--- branches/8.2.0/nanobsd/Files/etc/rc.freenas	2012-08-20 20:52:10 UTC (rev 12139)
+++ branches/8.2.0/nanobsd/Files/etc/rc.freenas	2012-08-20 20:53:55 UTC (rev 12140)
@@ -114,7 +114,7 @@
 	local host="${1}"
 	local tmpfile="$(mktemp -q /var/tmp/.adfooXXXXXX)"
 
-	dig -t srv +short "${host}" | egrep -v '^;;' | sort -n +0 +1 > "${tmpfile}"
+	dig -t srv +short +nocomments "${host}" | sort -n +0 +1 > "${tmpfile}"
 
 	exec 3<&0
 	exec 0<"${tmpfile}"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12142
          http://freenas.svn.sourceforge.net/freenas/?rev=12142&view=rev
Author:   jhixson
Date:     2012-08-20 21:02:55 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
MFC 12141 - remove ad_dcname since it's not used.

Modified Paths:
--------------
    branches/8.2.0/gui/services/models.py

Property Changed:
----------------
    branches/8.2.0/


Property changes on: branches/8.2.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137,12139
   + /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137,12139,12141

Modified: branches/8.2.0/gui/services/models.py
===================================================================
--- branches/8.2.0/gui/services/models.py	2012-08-20 21:01:28 UTC (rev 12141)
+++ branches/8.2.0/gui/services/models.py	2012-08-20 21:02:55 UTC (rev 12142)
@@ -1335,11 +1335,6 @@
 
 
 class ActiveDirectory(Model):
-    ad_dcname = models.CharField(
-            max_length=120,
-            verbose_name=_("Domain Controller Name"),
-            help_text=_("AD or PDC name.")
-            )
     ad_domainname = models.CharField(
             max_length=120,
             verbose_name=_("Domain Name (DNS/Realm-Name)"),

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12144
          http://freenas.svn.sourceforge.net/freenas/?rev=12144&view=rev
Author:   jhixson
Date:     2012-08-20 21:09:55 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
MFC 12143 - ad_dcname removal migration script

Added Paths:
-----------
    branches/8.2.0/gui/services/migrations/0070_auto__del_field_activedirectory_ad_dcname.py

Property Changed:
----------------
    branches/8.2.0/


Property changes on: branches/8.2.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137,12139,12141
   + /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137,12139,12141,12143

Copied: branches/8.2.0/gui/services/migrations/0070_auto__del_field_activedirectory_ad_dcname.py (from rev 12143, trunk/gui/services/migrations/0070_auto__del_field_activedirectory_ad_dcname.py)
===================================================================
--- branches/8.2.0/gui/services/migrations/0070_auto__del_field_activedirectory_ad_dcname.py	                        (rev 0)
+++ branches/8.2.0/gui/services/migrations/0070_auto__del_field_activedirectory_ad_dcname.py	2012-08-20 21:09:55 UTC (rev 12144)
@@ -0,0 +1,330 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Deleting field 'ActiveDirectory.ad_dcname'
+        db.delete_column('services_activedirectory', 'ad_dcname')
+
+
+    def backwards(self, orm):
+        # Adding field 'ActiveDirectory.ad_dcname'
+        db.add_column('services_activedirectory', 'ad_dcname',
+                      self.gf('django.db.models.fields.CharField')(default='', max_length=120),
+                      keep_default=False)
+
+
+    models = {
+        'services.activedirectory': {
+            'Meta': {'object_name': 'ActiveDirectory'},
+            'ad_adminname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ad_adminpw': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ad_allow_trusted_doms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ad_domainname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ad_netbiosname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ad_workgroup': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.afp': {
+            'Meta': {'object_name': 'AFP'},
+            'afp_srv_connections_limit': ('django.db.models.fields.IntegerField', [], {'default': '50', 'max_length': '120'}),
+            'afp_srv_guest': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'afp_srv_guest_user': ('freenasUI.freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120'}),
+            'afp_srv_name': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.cifs': {
+            'Meta': {'object_name': 'CIFS'},
+            'cifs_srv_aio_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_aio_rs': ('django.db.models.fields.IntegerField', [], {'default': '4096', 'max_length': '120'}),
+            'cifs_srv_aio_ws': ('django.db.models.fields.IntegerField', [], {'default': '4096', 'max_length': '120'}),
+            'cifs_srv_authmodel': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'cifs_srv_description': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'cifs_srv_dirmask': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'cifs_srv_dosattr': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_doscharset': ('django.db.models.fields.CharField', [], {'default': "'CP437'", 'max_length': '120'}),
+            'cifs_srv_easupport': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_filemask': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'cifs_srv_guest': ('freenasUI.freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120'}),
+            'cifs_srv_homedir': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'cifs_srv_homedir_aux': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'cifs_srv_homedir_browseable_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_homedir_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_hostlookup': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'cifs_srv_largerw': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_localmaster': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_loglevel': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '120'}),
+            'cifs_srv_netbiosname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'cifs_srv_nullpw': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_sendfile': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_smb_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'cifs_srv_timeserver': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_unixcharset': ('django.db.models.fields.CharField', [], {'default': "'UTF-8'", 'max_length': '120'}),
+            'cifs_srv_unixext': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'cifs_srv_workgroup': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'cifs_srv_zeroconf': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.dynamicdns': {
+            'Meta': {'object_name': 'DynamicDNS'},
+            'ddns_domain': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ddns_fupdateperiod': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ddns_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ddns_password': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ddns_provider': ('django.db.models.fields.CharField', [], {'default': "'dyndns'", 'max_length': '120', 'blank': 'True'}),
+            'ddns_updateperiod': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ddns_username': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.ftp': {
+            'Meta': {'object_name': 'FTP'},
+            'ftp_anonpath': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'ftp_anonuserbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_anonuserdlbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_banner': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+            'ftp_clients': ('django.db.models.fields.PositiveIntegerField', [], {'default': '32'}),
+            'ftp_defaultroot': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_dirmask': ('django.db.models.fields.CharField', [], {'default': "'077'", 'max_length': '3'}),
+            'ftp_filemask': ('django.db.models.fields.CharField', [], {'default': "'077'", 'max_length': '3'}),
+            'ftp_fxp': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_ident': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_ipconnections': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_localuserbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_localuserdlbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_loginattempt': ('django.db.models.fields.PositiveIntegerField', [], {'default': '3'}),
+            'ftp_masqaddress': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ftp_onlyanonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_onlylocal': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_options': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+            'ftp_passiveportsmax': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_passiveportsmin': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_port': ('django.db.models.fields.PositiveIntegerField', [], {'default': '21'}),
+            'ftp_resume': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_reversedns': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_rootlogin': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_ssltls': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_timeout': ('django.db.models.fields.PositiveIntegerField', [], {'default': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.iscsitarget': {
+            'Meta': {'object_name': 'iSCSITarget'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_alias': ('django.db.models.fields.CharField', [], {'max_length': '120', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'iscsi_target_authgroup': ('django.db.models.fields.IntegerField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'iscsi_target_authtype': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '120'}),
+            'iscsi_target_flags': ('django.db.models.fields.CharField', [], {'default': "'rw'", 'max_length': '120'}),
+            'iscsi_target_initialdigest': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '120'}),
+            'iscsi_target_initiatorgroup': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetAuthorizedInitiator']"}),
+            'iscsi_target_logical_blocksize': ('django.db.models.fields.IntegerField', [], {'default': '512', 'max_length': '3'}),
+            'iscsi_target_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '120'}),
+            'iscsi_target_portalgroup': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetPortal']"}),
+            'iscsi_target_queue_depth': ('django.db.models.fields.IntegerField', [], {'default': '32', 'max_length': '3'}),
+            'iscsi_target_serial': ('django.db.models.fields.CharField', [], {'default': "'10000001'", 'max_length': '16'}),
+            'iscsi_target_type': ('django.db.models.fields.CharField', [], {'default': "'Disk'", 'max_length': '120'})
+        },
+        'services.iscsitargetauthcredential': {
+            'Meta': {'object_name': 'iSCSITargetAuthCredential'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_auth_peersecret': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'iscsi_target_auth_peeruser': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'iscsi_target_auth_secret': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'iscsi_target_auth_tag': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            'iscsi_target_auth_user': ('django.db.models.fields.CharField', [], {'max_length': '120'})
+        },
+        'services.iscsitargetauthorizedinitiator': {
+            'Meta': {'object_name': 'iSCSITargetAuthorizedInitiator'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_initiator_auth_network': ('django.db.models.fields.TextField', [], {'default': "'ALL'", 'max_length': '2048'}),
+            'iscsi_target_initiator_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'iscsi_target_initiator_initiators': ('django.db.models.fields.TextField', [], {'default': "'ALL'", 'max_length': '2048'}),
+            'iscsi_target_initiator_tag': ('django.db.models.fields.IntegerField', [], {'default': '1', 'unique': 'True'})
+        },
+        'services.iscsitargetextent': {
+            'Meta': {'ordering': "['iscsi_target_extent_name']", 'object_name': 'iSCSITargetExtent'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_extent_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'iscsi_target_extent_filesize': ('django.db.models.fields.CharField', [], {'default': '0', 'max_length': '120'}),
+            'iscsi_target_extent_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '120'}),
+            'iscsi_target_extent_path': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'iscsi_target_extent_type': ('django.db.models.fields.CharField', [], {'max_length': '120'})
+        },
+        'services.iscsitargetglobalconfiguration': {
+            'Meta': {'object_name': 'iSCSITargetGlobalConfiguration'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_basename': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'iscsi_defaultt2r': ('django.db.models.fields.IntegerField', [], {'default': '60', 'max_length': '120'}),
+            'iscsi_defaultt2w': ('django.db.models.fields.IntegerField', [], {'default': '2', 'max_length': '120'}),
+            'iscsi_discoveryauthgroup': ('django.db.models.fields.IntegerField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'iscsi_discoveryauthmethod': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '120'}),
+            'iscsi_firstburst': ('django.db.models.fields.IntegerField', [], {'default': '65536', 'max_length': '120'}),
+            'iscsi_iotimeout': ('django.db.models.fields.IntegerField', [], {'default': '30', 'max_length': '120'}),
+            'iscsi_luc_authgroup': ('django.db.models.fields.IntegerField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'iscsi_luc_authmethod': ('django.db.models.fields.CharField', [], {'default': "'chap'", 'max_length': '120', 'blank': 'True'}),
+            'iscsi_luc_authnetwork': ('django.db.models.fields.CharField', [], {'default': "'127.0.0.0/8'", 'max_length': '120', 'blank': 'True'}),
+            'iscsi_lucip': ('django.db.models.fields.IPAddressField', [], {'default': "'127.0.0.1'", 'max_length': '15', 'null': 'True', 'blank': 'True'}),
+            'iscsi_lucport': ('django.db.models.fields.IntegerField', [], {'default': '3261', 'null': 'True', 'blank': 'True'}),
+            'iscsi_maxburst': ('django.db.models.fields.IntegerField', [], {'default': '262144', 'max_length': '120'}),
+            'iscsi_maxconnect': ('django.db.models.fields.IntegerField', [], {'default': '8', 'max_length': '120'}),
+            'iscsi_maxoutstandingr2t': ('django.db.models.fields.IntegerField', [], {'default': '16', 'max_length': '120'}),
+            'iscsi_maxrecdata': ('django.db.models.fields.IntegerField', [], {'default': '262144', 'max_length': '120'}),
+            'iscsi_maxsesh': ('django.db.models.fields.IntegerField', [], {'default': '16', 'max_length': '120'}),
+            'iscsi_nopinint': ('django.db.models.fields.IntegerField', [], {'default': '20', 'max_length': '120'}),
+            'iscsi_r2t': ('django.db.models.fields.IntegerField', [], {'default': '32', 'max_length': '120'}),
+            'iscsi_toggleluc': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'services.iscsitargetportal': {
+            'Meta': {'object_name': 'iSCSITargetPortal'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_portal_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'iscsi_target_portal_tag': ('django.db.models.fields.IntegerField', [], {'default': '1', 'max_length': '120'})
+        },
+        'services.iscsitargetportalip': {
+            'Meta': {'unique_together': "(('iscsi_target_portalip_ip', 'iscsi_target_portalip_port'),)", 'object_name': 'iSCSITargetPortalIP'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_portalip_ip': ('django.db.models.fields.IPAddressField', [], {'max_length': '15'}),
+            'iscsi_target_portalip_port': ('django.db.models.fields.SmallIntegerField', [], {'default': '3260'}),
+            'iscsi_target_portalip_portal': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetPortal']"})
+        },
+        'services.iscsitargettoextent': {
+            'Meta': {'object_name': 'iSCSITargetToExtent'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_extent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetExtent']", 'unique': 'True'}),
+            'iscsi_target': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITarget']"})
+        },
+        'services.ldap': {
+            'Meta': {'object_name': 'LDAP'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ldap_anonbind': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ldap_basedn': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_groupsuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_hostname': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_machinesuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_options': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_passwordsuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_pwencryption': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ldap_rootbasedn': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_rootbindpw': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_ssl': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ldap_tls_cacertfile': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ldap_usersuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'})
+        },
+        'services.nfs': {
+            'Meta': {'object_name': 'NFS'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nfs_srv_async': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'nfs_srv_servers': ('django.db.models.fields.PositiveIntegerField', [], {'default': '4'})
+        },
+        'services.pluginsjail': {
+            'Meta': {'object_name': 'PluginsJail'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'jail_ipv4address': ('freenasUI.contrib.IPAddressField.IPAddressField', [], {}),
+            'jail_ipv4netmask': ('django.db.models.fields.CharField', [], {'max_length': '3'}),
+            'jail_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '120'}),
+            'jail_path': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255'}),
+            'plugins_path': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255'})
+        },
+        'services.rpctoken': {
+            'Meta': {'object_name': 'RPCToken'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'secret': ('django.db.models.fields.CharField', [], {'max_length': '1024'})
+        },
+        'services.rsyncd': {
+            'Meta': {'object_name': 'Rsyncd'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'rsyncd_auxiliary': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsyncd_port': ('django.db.models.fields.IntegerField', [], {'default': '873'})
+        },
+        'services.rsyncmod': {
+            'Meta': {'ordering': "['rsyncmod_name']", 'object_name': 'RsyncMod'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'rsyncmod_auxiliary': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsyncmod_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'rsyncmod_group': ('freenasUI.freeadmin.models.GroupField', [], {'default': "'nobody'", 'max_length': '120', 'blank': 'True'}),
+            'rsyncmod_hostsallow': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsyncmod_hostsdeny': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsyncmod_maxconn': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'rsyncmod_mode': ('django.db.models.fields.CharField', [], {'default': "'rw'", 'max_length': '120'}),
+            'rsyncmod_name': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'rsyncmod_path': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255'}),
+            'rsyncmod_user': ('freenasUI.freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120', 'blank': 'True'})
+        },
+        'services.services': {
+            'Meta': {'object_name': 'services'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'srv_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'srv_service': ('django.db.models.fields.CharField', [], {'max_length': '120'})
+        },
+        'services.smart': {
+            'Meta': {'object_name': 'SMART'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'smart_critical': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'smart_difference': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'smart_email': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'smart_informal': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'smart_interval': ('django.db.models.fields.IntegerField', [], {'default': '30'}),
+            'smart_powermode': ('django.db.models.fields.CharField', [], {'default': "'never'", 'max_length': '60'})
+        },
+        'services.snmp': {
+            'Meta': {'object_name': 'SNMP'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'snmp_community': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'snmp_contact': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'snmp_location': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'snmp_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'snmp_traps': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'services.ssh': {
+            'Meta': {'object_name': 'SSH'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ssh_compression': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ssh_host_dsa_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_dsa_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_ecdsa_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_ecdsa_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_rsa_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_rsa_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_options': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+            'ssh_passwordauth': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ssh_privatekey': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'blank': 'True'}),
+            'ssh_rootlogin': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ssh_tcpfwd': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ssh_tcpport': ('django.db.models.fields.PositiveIntegerField', [], {})
+        },
+        'services.tftp': {
+            'Meta': {'object_name': 'TFTP'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'tftp_directory': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255'}),
+            'tftp_newfiles': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'tftp_options': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'tftp_port': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'tftp_umask': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'tftp_username': ('freenasUI.freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120'})
+        },
+        'services.ups': {
+            'Meta': {'object_name': 'UPS'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ups_description': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ups_driver': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ups_emailnotify': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ups_extrausers': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ups_identifier': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ups_masterpwd': ('django.db.models.fields.CharField', [], {'default': "'fixmepass'", 'max_length': '30'}),
+            'ups_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ups_port': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ups_rmonitor': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ups_shutdown': ('django.db.models.fields.CharField', [], {'default': "'batt'", 'max_length': '120'}),
+            'ups_shutdowntimer': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ups_subject': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ups_toemail': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['services']
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12188
          http://freenas.svn.sourceforge.net/freenas/?rev=12188&view=rev
Author:   jhixson
Date:     2012-08-28 22:56:41 +0000 (Tue, 28 Aug 2012)
Log Message:
-----------
MFC 12187 - dig comment fix

Modified Paths:
--------------
    branches/8.2.0/nanobsd/Files/etc/rc.freenas

Property Changed:
----------------
    branches/8.2.0/


Property changes on: branches/8.2.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137,12139,12141,12143
   + /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137,12139,12141,12143,12187

Modified: branches/8.2.0/nanobsd/Files/etc/rc.freenas
===================================================================
--- branches/8.2.0/nanobsd/Files/etc/rc.freenas	2012-08-28 22:54:03 UTC (rev 12187)
+++ branches/8.2.0/nanobsd/Files/etc/rc.freenas	2012-08-28 22:56:41 UTC (rev 12188)
@@ -114,7 +114,7 @@
 	local host="${1}"
 	local tmpfile="$(mktemp -q /var/tmp/.adfooXXXXXX)"
 
-	dig -t srv +short +nocomments "${host}" | sort -n +0 +1 > "${tmpfile}"
+	dig -t srv +short +nocomments "${host}" | egrep -v '^[[:space:]]*;;' | sort -n +0 +1 > "${tmpfile}"
 
 	exec 3<&0
 	exec 0<"${tmpfile}"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12192
          http://freenas.svn.sourceforge.net/freenas/?rev=12192&view=rev
Author:   jhixson
Date:     2012-08-29 02:46:54 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
MFC 12191 - cachetool revert and AD code fix. Only grab users/groups from the
domain we join unless 'allow trusted domains' is specified.

Modified Paths:
--------------
    branches/8.2.0/gui/common/freenasldap.py
    branches/8.2.0/gui/tools/cachetool.py

Property Changed:
----------------
    branches/8.2.0/
    branches/8.2.0/gui/tools/cachetool.py


Property changes on: branches/8.2.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137,12139,12141,12143,12187
   + /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137,12139,12141,12143,12187,12191

Modified: branches/8.2.0/gui/common/freenasldap.py
===================================================================
--- branches/8.2.0/gui/common/freenasldap.py	2012-08-29 02:43:34 UTC (rev 12191)
+++ branches/8.2.0/gui/common/freenasldap.py	2012-08-29 02:46:54 UTC (rev 12192)
@@ -999,6 +999,7 @@
         self.netbiosname = ad['ad_workgroup']
         self.binddn = ad['ad_adminname'] + '@' + self.domain.upper()
         self.bindpw = ad['ad_adminpw']
+        self.trusted = True if long(ad['ad_allow_trusted_doms']) != 0 else False
 
         host = port = None
         args = { 'binddn': self.binddn, 'bindpw': self.bindpw }
@@ -1023,6 +1024,7 @@
         host = port = None 
         self.domain = kwargs.get('domain', None)
         self.netbiosname = kwargs.get('netbiosname', None)
+        self.trusted = False
 
         tmphost = kwargs.get('host', None)
         if tmphost:
@@ -1284,6 +1286,9 @@
         basedn = rootDSE[0][1]['configurationNamingContext'][0]
         config = rootDSE[0][1]['defaultNamingContext'][0]
 
+        if not self.trusted and self.netbiosname:
+            kwargs['netbiosname'] = self.netbiosname
+
         result = []
         haskey = False
         for d in domains:

Modified: branches/8.2.0/gui/tools/cachetool.py
===================================================================
--- branches/8.2.0/gui/tools/cachetool.py	2012-08-29 02:43:34 UTC (rev 12191)
+++ branches/8.2.0/gui/tools/cachetool.py	2012-08-29 02:46:54 UTC (rev 12192)
@@ -53,11 +53,6 @@
     uargs = { 'flags': FLAGS_DBINIT|FLAGS_CACHE_WRITE_USER }
     gargs = { 'flags': FLAGS_DBINIT|FLAGS_CACHE_WRITE_GROUP }
 
-    objs = ActiveDirectory_objects()[0] 
-    if long(objs['ad_allow_trusted_doms']) == 0:
-        uargs['netbiosname'] = objs['ad_workgroup']
-        gargs['netbiosname'] = objs['ad_workgroup']
-
     for u in FreeNAS_Users(**uargs):
         pass
     for g in FreeNAS_Groups(**gargs):
@@ -99,17 +94,11 @@
 
 
 def _cache_keys_ActiveDirectory(**kwargs):
-    args = {}
-    objs = ActiveDirectory_objects()[0] 
-    if long(objs['ad_allow_trusted_doms']) == 0:
-        args['netbiosname'] = objs['ad_workgroup']
-
     ad = FreeNAS_ActiveDirectory(flags=FLAGS_DBINIT)
-    domains = ad.get_domains(**args)
+    domains = ad.get_domains()
     for d in domains:
         workgroup = d['nETBIOSName']
-        if workgroup != objs['ad_workgroup'] and long(objs['ad_allow_trusted_doms']) == 0:
-            continue
+
         print "w: %s" % workgroup 
 
         ucache = FreeNAS_UserCache(dir=workgroup)
@@ -157,17 +146,11 @@
 
 
 def _cache_rawdump_ActiveDirectory(**kwargs):
-    args = {}
-    objs = ActiveDirectory_objects()[0] 
-    if long(objs['ad_allow_trusted_doms']) == 0:
-        args['netbiosname'] = objs['ad_workgroup']
-
     ad = FreeNAS_ActiveDirectory(flags=FLAGS_DBINIT)
-    domains = ad.get_domains(**args)
+    domains = ad.get_domains()
     for d in domains:
         workgroup = d['nETBIOSName']
-        if workgroup != objs['ad_workgroup'] and long(objs['ad_allow_trusted_doms']) == 0:
-            continue
+
         print "w: %s" % workgroup 
 
         ucache = FreeNAS_UserCache(dir=workgroup)
@@ -218,18 +201,11 @@
     if not kwargs.has_key('args') and kwargs['args']:
         return
 
-    args = {}
     valid = {}
-    objs = ActiveDirectory_objects()[0] 
-    if long(objs['ad_allow_trusted_doms']) == 0:
-        args['netbiosname'] = objs['ad_workgroup']
-
     ad = FreeNAS_ActiveDirectory(flags=FLAGS_DBINIT)
-    domains = ad.get_domains(**args)
+    domains = ad.get_domains()
     for d in domains:
         workgroup = d['nETBIOSName']
-        if workgroup != objs['ad_workgroup'] and long(objs['ad_allow_trusted_doms']) == 0:
-            continue
         valid[workgroup] = True
 
     for arg in kwargs['args']:
@@ -342,17 +318,10 @@
 
 
 def _cache_count_ActiveDirectory(**kwargs):
-    args = {} 
-    objs = ActiveDirectory_objects()[0] 
-    if long(objs['ad_allow_trusted_doms']) == 0:
-        args['netbiosname'] = objs['ad_workgroup']
-
     ad = FreeNAS_ActiveDirectory(flags=FLAGS_DBINIT)
-    domains = ad.get_domains(**args)
+    domains = ad.get_domains()
     for d in domains:
         workgroup = d['nETBIOSName']
-        if workgroup != objs['ad_workgroup'] and long(objs['ad_allow_trusted_doms']) == 0:
-            continue
 
         print "w:  %s" % workgroup
         print "u:  %ld" % len(FreeNAS_UserCache(dir=workgroup))


Property changes on: branches/8.2.0/gui/tools/cachetool.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/8.0.1/gui/tools/cachetool.py:7333,7346
/branches/8.1/gui/tools/cachetool.py:6033-6383
/branches/8.2-nup/gui/tools/cachetool.py:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path/gui/tools/cachetool.py:10601
/branches/bs/gui/tools/cachetool.py:11368-11369,11377
/branches/build_system/gui/tools/cachetool.py:11262,11293-11294
/branches/dev-8.3/gui/tools/cachetool.py:10721
/branches/dojo17/gui/tools/cachetool.py:8468-8495
/branches/feedback/gui/tools/cachetool.py:6189-6347
/experimental/ix-8.2/gui/tools/cachetool.py:5657-5682
/tags/8.0.3-BETA2/gui/tools/cachetool.py:9099-9100
/trunk/gui/tools/cachetool.py:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137,12139,12141,12143,12187,12189
   + /branches/8.0.1/gui/tools/cachetool.py:7333,7346
/branches/8.1/gui/tools/cachetool.py:6033-6383
/branches/8.2-nup/gui/tools/cachetool.py:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path/gui/tools/cachetool.py:10601
/branches/bs/gui/tools/cachetool.py:11368-11369,11377
/branches/build_system/gui/tools/cachetool.py:11262,11293-11294
/branches/dev-8.3/gui/tools/cachetool.py:10721
/branches/dojo17/gui/tools/cachetool.py:8468-8495
/branches/feedback/gui/tools/cachetool.py:6189-6347
/experimental/ix-8.2/gui/tools/cachetool.py:5657-5682
/tags/8.0.3-BETA2/gui/tools/cachetool.py:9099-9100
/trunk/gui/tools/cachetool.py:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137,12139,12141,12143,12187,12189,12191

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12198
          http://freenas.svn.sourceforge.net/freenas/?rev=12198&view=rev
Author:   jhixson
Date:     2012-08-29 14:45:56 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
MFC 12197 - AD verbose logging

Modified Paths:
--------------
    branches/8.2.0/gui/services/models.py

Added Paths:
-----------
    branches/8.2.0/gui/services/migrations/0073_auto__add_field_activedirectory_ad_verbose_logging.py

Property Changed:
----------------
    branches/8.2.0/


Property changes on: branches/8.2.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137,12139,12141,12143,12187,12191
   + /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137,12139,12141,12143,12187,12191,12197

Copied: branches/8.2.0/gui/services/migrations/0073_auto__add_field_activedirectory_ad_verbose_logging.py (from rev 12197, trunk/gui/services/migrations/0073_auto__add_field_activedirectory_ad_verbose_logging.py)
===================================================================
--- branches/8.2.0/gui/services/migrations/0073_auto__add_field_activedirectory_ad_verbose_logging.py	                        (rev 0)
+++ branches/8.2.0/gui/services/migrations/0073_auto__add_field_activedirectory_ad_verbose_logging.py	2012-08-29 14:45:56 UTC (rev 12198)
@@ -0,0 +1,333 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'ActiveDirectory.ad_verbose_logging'
+        db.add_column('services_activedirectory', 'ad_verbose_logging',
+                      self.gf('django.db.models.fields.BooleanField')(default=False),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'ActiveDirectory.ad_verbose_logging'
+        db.delete_column('services_activedirectory', 'ad_verbose_logging')
+
+
+    models = {
+        'services.activedirectory': {
+            'Meta': {'object_name': 'ActiveDirectory'},
+            'ad_adminname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ad_adminpw': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ad_allow_trusted_doms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ad_domainname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ad_netbiosname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ad_use_default_domain': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'ad_verbose_logging': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ad_workgroup': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.afp': {
+            'Meta': {'object_name': 'AFP'},
+            'afp_srv_connections_limit': ('django.db.models.fields.IntegerField', [], {'default': '50', 'max_length': '120'}),
+            'afp_srv_guest': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'afp_srv_guest_user': ('freenasUI.freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120'}),
+            'afp_srv_name': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.cifs': {
+            'Meta': {'object_name': 'CIFS'},
+            'cifs_srv_aio_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_aio_rs': ('django.db.models.fields.IntegerField', [], {'default': '4096', 'max_length': '120'}),
+            'cifs_srv_aio_ws': ('django.db.models.fields.IntegerField', [], {'default': '4096', 'max_length': '120'}),
+            'cifs_srv_authmodel': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'cifs_srv_description': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'cifs_srv_dirmask': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'cifs_srv_dosattr': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_doscharset': ('django.db.models.fields.CharField', [], {'default': "'CP437'", 'max_length': '120'}),
+            'cifs_srv_easupport': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_filemask': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'cifs_srv_guest': ('freenasUI.freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120'}),
+            'cifs_srv_homedir': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'cifs_srv_homedir_aux': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'cifs_srv_homedir_browseable_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_homedir_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_hostlookup': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'cifs_srv_largerw': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_localmaster': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_loglevel': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '120'}),
+            'cifs_srv_netbiosname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'cifs_srv_nullpw': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_sendfile': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_smb_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'cifs_srv_timeserver': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_unixcharset': ('django.db.models.fields.CharField', [], {'default': "'UTF-8'", 'max_length': '120'}),
+            'cifs_srv_unixext': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'cifs_srv_workgroup': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'cifs_srv_zeroconf': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.dynamicdns': {
+            'Meta': {'object_name': 'DynamicDNS'},
+            'ddns_domain': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ddns_fupdateperiod': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ddns_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ddns_password': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ddns_provider': ('django.db.models.fields.CharField', [], {'default': "'dyndns'", 'max_length': '120', 'blank': 'True'}),
+            'ddns_updateperiod': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ddns_username': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.ftp': {
+            'Meta': {'object_name': 'FTP'},
+            'ftp_anonpath': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'ftp_anonuserbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_anonuserdlbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_banner': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+            'ftp_clients': ('django.db.models.fields.PositiveIntegerField', [], {'default': '32'}),
+            'ftp_defaultroot': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_dirmask': ('django.db.models.fields.CharField', [], {'default': "'077'", 'max_length': '3'}),
+            'ftp_filemask': ('django.db.models.fields.CharField', [], {'default': "'077'", 'max_length': '3'}),
+            'ftp_fxp': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_ident': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_ipconnections': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_localuserbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_localuserdlbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_loginattempt': ('django.db.models.fields.PositiveIntegerField', [], {'default': '3'}),
+            'ftp_masqaddress': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ftp_onlyanonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_onlylocal': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_options': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+            'ftp_passiveportsmax': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_passiveportsmin': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_port': ('django.db.models.fields.PositiveIntegerField', [], {'default': '21'}),
+            'ftp_resume': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_reversedns': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_rootlogin': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_ssltls': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_ssltls_certfile': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ftp_timeout': ('django.db.models.fields.PositiveIntegerField', [], {'default': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.iscsitarget': {
+            'Meta': {'object_name': 'iSCSITarget'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_alias': ('django.db.models.fields.CharField', [], {'max_length': '120', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'iscsi_target_authgroup': ('django.db.models.fields.IntegerField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'iscsi_target_authtype': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '120'}),
+            'iscsi_target_flags': ('django.db.models.fields.CharField', [], {'default': "'rw'", 'max_length': '120'}),
+            'iscsi_target_initialdigest': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '120'}),
+            'iscsi_target_initiatorgroup': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetAuthorizedInitiator']"}),
+            'iscsi_target_logical_blocksize': ('django.db.models.fields.IntegerField', [], {'default': '512', 'max_length': '3'}),
+            'iscsi_target_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '120'}),
+            'iscsi_target_portalgroup': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetPortal']"}),
+            'iscsi_target_queue_depth': ('django.db.models.fields.IntegerField', [], {'default': '32', 'max_length': '3'}),
+            'iscsi_target_serial': ('django.db.models.fields.CharField', [], {'default': "'10000001'", 'max_length': '16'}),
+            'iscsi_target_type': ('django.db.models.fields.CharField', [], {'default': "'Disk'", 'max_length': '120'})
+        },
+        'services.iscsitargetauthcredential': {
+            'Meta': {'object_name': 'iSCSITargetAuthCredential'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_auth_peersecret': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'iscsi_target_auth_peeruser': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'iscsi_target_auth_secret': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'iscsi_target_auth_tag': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            'iscsi_target_auth_user': ('django.db.models.fields.CharField', [], {'max_length': '120'})
+        },
+        'services.iscsitargetauthorizedinitiator': {
+            'Meta': {'object_name': 'iSCSITargetAuthorizedInitiator'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_initiator_auth_network': ('django.db.models.fields.TextField', [], {'default': "'ALL'", 'max_length': '2048'}),
+            'iscsi_target_initiator_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'iscsi_target_initiator_initiators': ('django.db.models.fields.TextField', [], {'default': "'ALL'", 'max_length': '2048'}),
+            'iscsi_target_initiator_tag': ('django.db.models.fields.IntegerField', [], {'default': '1', 'unique': 'True'})
+        },
+        'services.iscsitargetextent': {
+            'Meta': {'ordering': "['iscsi_target_extent_name']", 'object_name': 'iSCSITargetExtent'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_extent_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'iscsi_target_extent_filesize': ('django.db.models.fields.CharField', [], {'default': '0', 'max_length': '120'}),
+            'iscsi_target_extent_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '120'}),
+            'iscsi_target_extent_path': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'iscsi_target_extent_type': ('django.db.models.fields.CharField', [], {'max_length': '120'})
+        },
+        'services.iscsitargetglobalconfiguration': {
+            'Meta': {'object_name': 'iSCSITargetGlobalConfiguration'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_basename': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'iscsi_defaultt2r': ('django.db.models.fields.IntegerField', [], {'default': '60', 'max_length': '120'}),
+            'iscsi_defaultt2w': ('django.db.models.fields.IntegerField', [], {'default': '2', 'max_length': '120'}),
+            'iscsi_discoveryauthgroup': ('django.db.models.fields.IntegerField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'iscsi_discoveryauthmethod': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '120'}),
+            'iscsi_firstburst': ('django.db.models.fields.IntegerField', [], {'default': '65536', 'max_length': '120'}),
+            'iscsi_iotimeout': ('django.db.models.fields.IntegerField', [], {'default': '30', 'max_length': '120'}),
+            'iscsi_luc_authgroup': ('django.db.models.fields.IntegerField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'iscsi_luc_authmethod': ('django.db.models.fields.CharField', [], {'default': "'chap'", 'max_length': '120', 'blank': 'True'}),
+            'iscsi_luc_authnetwork': ('django.db.models.fields.CharField', [], {'default': "'127.0.0.0/8'", 'max_length': '120', 'blank': 'True'}),
+            'iscsi_lucip': ('django.db.models.fields.IPAddressField', [], {'default': "'127.0.0.1'", 'max_length': '15', 'null': 'True', 'blank': 'True'}),
+            'iscsi_lucport': ('django.db.models.fields.IntegerField', [], {'default': '3261', 'null': 'True', 'blank': 'True'}),
+            'iscsi_maxburst': ('django.db.models.fields.IntegerField', [], {'default': '262144', 'max_length': '120'}),
+            'iscsi_maxconnect': ('django.db.models.fields.IntegerField', [], {'default': '8', 'max_length': '120'}),
+            'iscsi_maxoutstandingr2t': ('django.db.models.fields.IntegerField', [], {'default': '16', 'max_length': '120'}),
+            'iscsi_maxrecdata': ('django.db.models.fields.IntegerField', [], {'default': '262144', 'max_length': '120'}),
+            'iscsi_maxsesh': ('django.db.models.fields.IntegerField', [], {'default': '16', 'max_length': '120'}),
+            'iscsi_nopinint': ('django.db.models.fields.IntegerField', [], {'default': '20', 'max_length': '120'}),
+            'iscsi_r2t': ('django.db.models.fields.IntegerField', [], {'default': '32', 'max_length': '120'}),
+            'iscsi_toggleluc': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'services.iscsitargetportal': {
+            'Meta': {'object_name': 'iSCSITargetPortal'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_portal_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'iscsi_target_portal_tag': ('django.db.models.fields.IntegerField', [], {'default': '1', 'max_length': '120'})
+        },
+        'services.iscsitargetportalip': {
+            'Meta': {'unique_together': "(('iscsi_target_portalip_ip', 'iscsi_target_portalip_port'),)", 'object_name': 'iSCSITargetPortalIP'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_portalip_ip': ('django.db.models.fields.IPAddressField', [], {'max_length': '15'}),
+            'iscsi_target_portalip_port': ('django.db.models.fields.SmallIntegerField', [], {'default': '3260'}),
+            'iscsi_target_portalip_portal': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetPortal']"})
+        },
+        'services.iscsitargettoextent': {
+            'Meta': {'object_name': 'iSCSITargetToExtent'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_extent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetExtent']", 'unique': 'True'}),
+            'iscsi_target': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITarget']"})
+        },
+        'services.ldap': {
+            'Meta': {'object_name': 'LDAP'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ldap_anonbind': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ldap_basedn': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_groupsuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_hostname': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_machinesuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_options': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_passwordsuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_pwencryption': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ldap_rootbasedn': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_rootbindpw': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_ssl': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ldap_tls_cacertfile': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ldap_usersuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'})
+        },
+        'services.nfs': {
+            'Meta': {'object_name': 'NFS'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nfs_srv_async': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'nfs_srv_servers': ('django.db.models.fields.PositiveIntegerField', [], {'default': '4'})
+        },
+        'services.pluginsjail': {
+            'Meta': {'object_name': 'PluginsJail'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'jail_ipv4address': ('freenasUI.contrib.IPAddressField.IPAddressField', [], {}),
+            'jail_ipv4netmask': ('django.db.models.fields.CharField', [], {'max_length': '3'}),
+            'jail_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '120'}),
+            'jail_path': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255'}),
+            'plugins_path': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255'})
+        },
+        'services.rpctoken': {
+            'Meta': {'object_name': 'RPCToken'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'secret': ('django.db.models.fields.CharField', [], {'max_length': '1024'})
+        },
+        'services.rsyncd': {
+            'Meta': {'object_name': 'Rsyncd'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'rsyncd_auxiliary': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsyncd_port': ('django.db.models.fields.IntegerField', [], {'default': '873'})
+        },
+        'services.rsyncmod': {
+            'Meta': {'ordering': "['rsyncmod_name']", 'object_name': 'RsyncMod'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'rsyncmod_auxiliary': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsyncmod_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'rsyncmod_group': ('freenasUI.freeadmin.models.GroupField', [], {'default': "'nobody'", 'max_length': '120', 'blank': 'True'}),
+            'rsyncmod_hostsallow': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsyncmod_hostsdeny': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsyncmod_maxconn': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'rsyncmod_mode': ('django.db.models.fields.CharField', [], {'default': "'rw'", 'max_length': '120'}),
+            'rsyncmod_name': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'rsyncmod_path': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255'}),
+            'rsyncmod_user': ('freenasUI.freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120', 'blank': 'True'})
+        },
+        'services.services': {
+            'Meta': {'object_name': 'services'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'srv_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'srv_service': ('django.db.models.fields.CharField', [], {'max_length': '120'})
+        },
+        'services.smart': {
+            'Meta': {'object_name': 'SMART'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'smart_critical': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'smart_difference': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'smart_email': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'smart_informal': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'smart_interval': ('django.db.models.fields.IntegerField', [], {'default': '30'}),
+            'smart_powermode': ('django.db.models.fields.CharField', [], {'default': "'never'", 'max_length': '60'})
+        },
+        'services.snmp': {
+            'Meta': {'object_name': 'SNMP'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'snmp_community': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'snmp_contact': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'snmp_location': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'snmp_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'snmp_traps': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'services.ssh': {
+            'Meta': {'object_name': 'SSH'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ssh_compression': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ssh_host_dsa_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_dsa_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_ecdsa_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_ecdsa_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_rsa_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_rsa_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_options': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+            'ssh_passwordauth': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ssh_privatekey': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'blank': 'True'}),
+            'ssh_rootlogin': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ssh_tcpfwd': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ssh_tcpport': ('django.db.models.fields.PositiveIntegerField', [], {})
+        },
+        'services.tftp': {
+            'Meta': {'object_name': 'TFTP'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'tftp_directory': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255'}),
+            'tftp_newfiles': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'tftp_options': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'tftp_port': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'tftp_umask': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'tftp_username': ('freenasUI.freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120'})
+        },
+        'services.ups': {
+            'Meta': {'object_name': 'UPS'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ups_description': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ups_driver': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ups_emailnotify': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ups_extrausers': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ups_identifier': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ups_masterpwd': ('django.db.models.fields.CharField', [], {'default': "'fixmepass'", 'max_length': '30'}),
+            'ups_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ups_port': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ups_rmonitor': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ups_shutdown': ('django.db.models.fields.CharField', [], {'default': "'batt'", 'max_length': '120'}),
+            'ups_shutdowntimer': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ups_subject': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ups_toemail': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['services']
\ No newline at end of file

Modified: branches/8.2.0/gui/services/models.py
===================================================================
--- branches/8.2.0/gui/services/models.py	2012-08-29 14:43:49 UTC (rev 12197)
+++ branches/8.2.0/gui/services/models.py	2012-08-29 14:45:56 UTC (rev 12198)
@@ -1354,6 +1354,10 @@
             default=False,
             verbose_name=_("Allow Trusted Domains"),
             )
+    ad_verbose_logging = models.BooleanField(
+            default=False,
+            verbose_name=_("Verbose logging"),
+            )
     ad_adminname = models.CharField(
             max_length=120,
             verbose_name=_("Administrator Name"),

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12203
          http://freenas.svn.sourceforge.net/freenas/?rev=12203&view=rev
Author:   jhixson
Date:     2012-08-29 16:54:51 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
MFC 12202 - AD verbose logging in rc.freenas

Modified Paths:
--------------
    branches/8.2.0/nanobsd/Files/etc/rc.freenas

Property Changed:
----------------
    branches/8.2.0/


Property changes on: branches/8.2.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137,12139,12141,12143,12187,12191,12197
   + /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137,12139,12141,12143,12187,12191,12197,12202

Modified: branches/8.2.0/nanobsd/Files/etc/rc.freenas
===================================================================
--- branches/8.2.0/nanobsd/Files/etc/rc.freenas	2012-08-29 16:53:29 UTC (rev 12202)
+++ branches/8.2.0/nanobsd/Files/etc/rc.freenas	2012-08-29 16:54:51 UTC (rev 12203)
@@ -114,6 +114,7 @@
 	local host="${1}"
 	local tmpfile="$(mktemp -q /var/tmp/.adfooXXXXXX)"
 
+	AD_log "__get_SRV_record: dig -t srv +short +nocomments ${host}"
 	dig -t srv +short +nocomments "${host}" | egrep -v '^[[:space:]]*;;' | sort -n +0 +1 > "${tmpfile}"
 
 	exec 3<&0
@@ -123,14 +124,20 @@
 		local host=$(echo "${line}"|awk '{ print $4 }'|sed 's/\.$//')
 		local port=$(echo "${line}"|awk '{ print $3 }')
 
+		AD_log "__get_SRV_record: trying ${host}:${port}"
+		
 		__do_AD_query "${host}" "${port}" "" "" "" "base" "" "" >/dev/null 2>&1
 		if [ "$?" = "0" ]
 		then
 			exec 0<&3
 			echo "${host}:${port}"
 			rm "${tmpfile}"
+
+			AD_log "__get_SRV_record: Okay"
 			return 0
 		fi
+
+		AD_log "__get_SRV_record: Fail"
 	done
 	exec 0<&3
 	rm "${tmpfile}"
@@ -140,12 +147,16 @@
 
 AD_get_domain_controller()
 {
+	AD_log "AD_get_domain_controller: _ldap._tcp.${1}"
+
 	__get_SRV_record "_ldap._tcp.${1}"
 	return $?
 }
 
 AD_get_global_catalog()
 {
+	AD_log "AD_get_global_catalog: _gc._tcp.${1}"
+
 	__get_SRV_record "_gc._tcp.${1}"
 	return $?
 }
@@ -201,6 +212,8 @@
 	: ${basedn:="$(AD_get basedn)"}
 	: ${filter:='(objectclass=*)'}
 
+	AD_log "AD_query: basedn = ${basedn}, filter = ${filter}, attributes = ${attributes}"
+
 	local dcname="$(AD_get dcname)"
 	local dcport="$(AD_get dcport)"
 	local binddn="$(AD_get binddn)"
@@ -216,6 +229,8 @@
 	local config="$(AD_query_rootDSE|egrep '^configurationNamingContext'|cut -f2- -d:|xargs)"
 	local basedn="CN=Partitions,${config}"
 
+	AD_log "AD_query_partitions: config = ${config}, basedn = ${basedn}"
+
 	AD_query "${basedn}" "" netbiosname|grep '^nETBIOSName'|cut -f2- -d:|xargs
 }
 
@@ -229,6 +244,8 @@
 
     	: ${filter:='(objectclass=*)'}
 
+	AD_log "AD_query_global_catalog: filter = ${filter}, attributes = ${attributes}"
+
 	local gchost="$(AD_get gchost)"
 	local gcport="$(AD_get gcport)"
 	local binddn="$(AD_get binddn)"
@@ -260,6 +277,8 @@
 
 	: ${filter:='(objectclass=*)'}
 
+	AD_log "AD_query_rootDSE: filter = ${filter}, attributes = ${attributes}"
+
 	local dcname="$(AD_get dcname)"
 	local dcport="$(AD_get dcport)"
 	local binddn="$(AD_get binddn)"
@@ -285,12 +304,12 @@
 
 __escape()
 {
-	printf "${1}" | sed -Ee 's|\\|\\\\|g' -Ee 's|[^a-zA-Z0-9]|\\&|g'
+	[ -n "${1}" ] && printf "${1}" | sed -Ee 's|\\|\\\\|g' -Ee 's|[^a-zA-Z0-9]|\\&|g'
 }
 
 __unescape()
 {
-	printf "${1}" | sed -Ee 's|\\([^a-zA-Z0-9])|\1|g' -Ee 's|\\\\|\\|g'
+	[ -n "${1}" ] && printf "${1}" | sed -Ee 's|\\([^a-zA-Z0-9])|\1|g' -Ee 's|\\\\|\\|g'
 }
 
 __do_AD_get()
@@ -310,7 +329,7 @@
 
 	for v in ${vars}
 	do
-		__do_AD_get "${prefix}" "${v}"
+		__do_AD_get "${prefix}" "${v}" 2>/dev/null
 	done
 }
 
@@ -330,7 +349,7 @@
 	local val="${2}"
 	local prefix="__ad_"
 
-	__do_AD_set "${prefix}" "${var}" "${val}"
+	__do_AD_set "${prefix}" "${var}" "${val}" 2>/dev/null
 }
 
 AD_save()
@@ -378,38 +397,85 @@
 {
 	local adminname="${1}"
 	local adminpw="${2}"
+	local res
 
 	: ${adminname:="$(AD_get adminname)"}
 	: ${adminpw:="$(AD_get adminpw)"}
 
+	AD_log "AD_join_domain: net ads join -U ${adminname}"
+
 	/usr/local/bin/net ads join -U "${adminname}%${adminpw}"
-	return $?
+	res=$?
+
+	local ok="Failed"
+	if [ "${res}" = "0" ]
+	then
+		ok="Successful"
+	fi
+
+	AD_log "AD_join_domain: ${ok}"
+	return ${res}
 }
 
 AD_status_domain()
 {
 	local adminname="${1}"
 	local adminpw="${2}"
+	local res
 
 	: ${adminname:="$(AD_get adminname)"}
 	: ${adminpw:="$(AD_get adminpw)"}
 
+	AD_log "AD_status_domain: net ads status -U ${adminname}"
+
 	/usr/local/bin/net ads status -U "${adminname}%${adminpw}"
-	return $?
+	res=$?
+
+	local ok="Not okay"
+	if [ "${res}" = "0" ]
+	then
+		ok="Okay"
+	fi
+
+	AD_log "AD_status_domain: ${ok}"
+	return ${res}
 }
 
 AD_leave_domain()
 {
 	local adminname="${1}"
 	local adminpw="${2}"
+	local res
 
 	: ${adminname:="$(AD_get adminname)"}
 	: ${adminpw:="$(AD_get adminpw)"}
 
+	AD_log "AD_leave_domain: net ads leave -U ${adminname}"
+
 	/usr/local/bin/net ads leave -U "${adminname}%${adminpw}"
-	return $?
+	res=$?
+
+	local ok="Failed"
+	if [ "${res}" = "0" ]
+	then
+		ok="Successful"
+	fi
+
+	AD_log "AD_leave_domain: ${ok}"
+	return ${res}
 }
 
+AD_log()
+{
+	local args="$*"
+
+	local on="$(AD_get verbose_logging)"
+	if [ "${on}" = "1" ]
+	then
+		logger -t "ActiveDirectory" ${args} >/dev/null 2>&1
+	fi
+}
+
 AD_init()
 {
 	local tmpfile="$(mktemp -q /var/tmp/.adfooXXXXXX)"
@@ -420,8 +486,9 @@
 		ad_adminname,
 		ad_adminpw,
 		ad_workgroup,
-		ad_netbiosname
-
+		ad_netbiosname,
+		ad_verbose_logging
+ 
 	FROM
 		services_activedirectory
 
@@ -435,7 +502,7 @@
 	exec 0<"${tmpfile}"
 	while read -r line
 	do
-		var=$(echo ${line}|cut -f1 -d=|xargs|cut -f2 -d_)
+		var=$(echo ${line}|cut -f1 -d=|xargs|cut -f2- -d_)
 		val=$(echo ${line}|cut -f2- -d=|xargs)
 
 		AD_set "${var}" "${val}"
@@ -446,16 +513,20 @@
 	local adminname=$(AD_get adminname)
 	local domainname=$(AD_get domainname)
 	AD_set binddn "${adminname}@$(echo ${domainname}|tr a-z A-Z)"
+	AD_log "AD_init: binddn = $(AD_get binddn)"
 
 	local dc=$(AD_get_domain_controller "${domainname}")
 	AD_set dcname "$(echo "${dc}"|cut -f1 -d:)"
 	AD_set dcport "$(echo "${dc}"|cut -f2 -d:)"
+	AD_log "AD_init: dcname = $(AD_get dcname), dcport = $(AD_get dcport)"
 
 	AD_set basedn "$(AD_query_rootDSE|egrep '^defaultNamingContext'|cut -f2- -d:|xargs)"
+	AD_log "AD_init: basedn = $(AD_get basedn)"
 
 	local gc=$(AD_get_global_catalog "${domainname}")
 	AD_set gchost "$(echo "${gc}"|cut -f1 -d:)"
 	AD_set gcport "$(echo "${gc}"|cut -f2 -d:)"
+	AD_log "AD_init: gchost = $(AD_get gchost), gcport = $(AD_get gcport)"
 }
 
 # Create a cache filesystem on ${FREENAS_CACHEDIR} .

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12207
          http://freenas.svn.sourceforge.net/freenas/?rev=12207&view=rev
Author:   jhixson
Date:     2012-08-29 17:10:52 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
MFC 12206 - AD verbose logging

Modified Paths:
--------------
    branches/8.2.0/nanobsd/Files/etc/rc.d/ix-kerberos

Property Changed:
----------------
    branches/8.2.0/


Property changes on: branches/8.2.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137,12139,12141,12143,12187,12191,12197,12202
   + /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137,12139,12141,12143,12187,12191,12197,12202,12206

Modified: branches/8.2.0/nanobsd/Files/etc/rc.d/ix-kerberos
===================================================================
--- branches/8.2.0/nanobsd/Files/etc/rc.d/ix-kerberos	2012-08-29 17:09:27 UTC (rev 12206)
+++ branches/8.2.0/nanobsd/Files/etc/rc.d/ix-kerberos	2012-08-29 17:10:52 UTC (rev 12207)
@@ -20,6 +20,9 @@
 	local _adminpw="${5}"
 	local _template
 
+	AD_log "generate_krb5_conf: dcname = ${_dcname}, domainname = ${_domainname}, " \
+		"netbiosname = ${_netbiosname}, adminname = ${_adminname}"
+
 	_template="${PATH_KRB5_TEMPLATE}"
 
 	if [ ! -f "${_template}" ]
@@ -50,6 +53,13 @@
 	}
 	' < "${_template}" > "${PATH_KRB5_CONFIG}"
 
+	local IFS="
+"
+	for line in $(verify_krb5_conf 2>&1) 
+	do
+		AD_log "generate_krb5_conf: ${line}"
+	done
+
 	return 0
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12210
          http://freenas.svn.sourceforge.net/freenas/?rev=12210&view=rev
Author:   jhixson
Date:     2012-08-29 17:36:16 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
MFC 12209 - Add AD verbose logging to ix-samba.

Modified Paths:
--------------
    branches/8.2.0/nanobsd/Files/etc/rc.d/ix-samba

Property Changed:
----------------
    branches/8.2.0/


Property changes on: branches/8.2.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137,12139,12141,12143,12187,12191,12197,12202,12206
   + /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137,12139,12141,12143,12187,12191,12197,12202,12206,12209

Modified: branches/8.2.0/nanobsd/Files/etc/rc.d/ix-samba
===================================================================
--- branches/8.2.0/nanobsd/Files/etc/rc.d/ix-samba	2012-08-29 17:34:48 UTC (rev 12209)
+++ branches/8.2.0/nanobsd/Files/etc/rc.d/ix-samba	2012-08-29 17:36:16 UTC (rev 12210)
@@ -575,6 +575,19 @@
 	generate_smbconf > ${SMB_CONF}
 	generate_exports >> ${SMB_CONF}
 	generate_avahi_cifs_service
+
+	if srv_enabled activedirectory
+	then
+		AD_init
+		AD_log "generate_smb_config: checking testparm issues"
+
+		local IFS="
+"
+		for line in $(echo|testparm 2>/dev/stdout 1>/dev/null)
+		do
+			AD_log "generate_smb_config: testparm: ${line}"
+		done
+	fi
 }
 
 name="ix-samba"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12213
          http://freenas.svn.sourceforge.net/freenas/?rev=12213&view=rev
Author:   jhixson
Date:     2012-08-29 17:49:55 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
MFC 12212 - AD verbose logging

Modified Paths:
--------------
    branches/8.2.0/nanobsd/Files/etc/rc.d/ix-kinit

Property Changed:
----------------
    branches/8.2.0/


Property changes on: branches/8.2.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137,12139,12141,12143,12187,12191,12197,12202,12206,12209
   + /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137,12139,12141,12143,12187,12191,12197,12202,12206,12209,12212

Modified: branches/8.2.0/nanobsd/Files/etc/rc.d/ix-kinit
===================================================================
--- branches/8.2.0/nanobsd/Files/etc/rc.d/ix-kinit	2012-08-29 17:48:37 UTC (rev 12212)
+++ branches/8.2.0/nanobsd/Files/etc/rc.d/ix-kinit	2012-08-29 17:49:55 UTC (rev 12213)
@@ -13,10 +13,9 @@
 
 kerberos_start()
 {
-	local ec pwfile
+	local res=1
+	local pwfile
 
-	ec=1
-
 	if srv_enabled activedirectory
 	then
 		AD_init
@@ -27,26 +26,36 @@
 
 		if [ -n "${adminname}" -a -n "${domainname}" -a -n "${adminpw}" ]
 		then
+			domainname=$(echo "${domainname}" | tr a-z A-Z)
+
 			pwfile=$(mktemp /tmp/tmp.XXXXXXXX)
 			printf "${adminpw}" > ${pwfile}
-			domainname=$(echo "${domainname}" | tr a-z A-Z)
+
+			AD_log "kerberos_start: kinit --password-file=${pwfile} " \
+			    "${adminname}@${domainname}"
 			kinit --password-file="${pwfile}" \
 			    "${adminname}@${domainname}"
-			ec=$?
+			res=$?
+
+			local ok="Failed"
+			if [ "${res}" = "0" ]
+			then
+				ok="Successful"
+			fi
+
+			AD_log "kerberos_start: ${ok}"
 			rm -f "${pwfile}"
-
 			sleep 10
 		fi
 	fi
-	return $ec
+
+	return ${res}
 }
 
 kerberos_status()
 {
-	local ec
+	local res=1
 
-	ec=1
-
 	if srv_enabled activedirectory
 	then
 		AD_init
@@ -58,11 +67,22 @@
 		if [ -n "${adminname}" -a -n "${domainname}" -a -n "${adminpw}" ]
 		then
 			domainname=$(echo "${domainname}"|tr a-z A-Z)
+
+			AD_log "kerberos_status: klist -l | grep -q ^${adminname}@${domainname}"
 			klist -l | grep -q "^${adminname}@${domainname}"
-			ec=$?
+			res=$?
+
+			local ok="Failed"
+			if [ "${res}" = "0" ]
+			then
+				ok="Successful"
+			fi
+
+			AD_log "kerberos_status: ${ok}"
 		fi
 	fi
-	return $ec
+
+	return ${res}
 }
 
 kerberos_stop()

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12218
          http://freenas.svn.sourceforge.net/freenas/?rev=12218&view=rev
Author:   jhixson
Date:     2012-08-29 18:08:39 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
MFC 12217 - AD verbose logging

Modified Paths:
--------------
    branches/8.2.0/nanobsd/Files/etc/rc.d/ix-activedirectory

Property Changed:
----------------
    branches/8.2.0/


Property changes on: branches/8.2.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137,12139,12141,12143,12187,12191,12197,12202,12206,12209,12212
   + /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137,12139,12141,12143,12187,12191,12197,12202,12206,12209,12212,12217

Modified: branches/8.2.0/nanobsd/Files/etc/rc.d/ix-activedirectory
===================================================================
--- branches/8.2.0/nanobsd/Files/etc/rc.d/ix-activedirectory	2012-08-29 18:07:25 UTC (rev 12217)
+++ branches/8.2.0/nanobsd/Files/etc/rc.d/ix-activedirectory	2012-08-29 18:08:39 UTC (rev 12218)
@@ -140,6 +140,8 @@
 	if srv_enabled activedirectory
 	then
 		AD_init
+
+		AD_log "activedirectory_start: trying to join domain"
 		if ! AD_join_domain; then
 			return 1
 		fi
@@ -157,6 +159,8 @@
 activedirectory_status()
 {
 	AD_init
+
+	AD_log "activedirectory_status: checking status"
 	AD_status_domain >/dev/null
 }
 
@@ -165,6 +169,8 @@
 	AD_init
 
         /usr/local/www/freenasUI/tools/cachetool.py expire
+
+	AD_log "activedirectory_stop: leaving domain"
 	AD_leave_domain
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12220
          http://freenas.svn.sourceforge.net/freenas/?rev=12220&view=rev
Author:   jhixson
Date:     2012-08-29 19:33:43 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
MFC 12219 - Fedora LDAP server suckage unbreakage.

Modified Paths:
--------------
    branches/8.2.0/nanobsd/Files/etc/rc.d/ix-ldap

Property Changed:
----------------
    branches/8.2.0/


Property changes on: branches/8.2.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137,12139,12141,12143,12187,12191,12197,12202,12206,12209,12212,12217
   + /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137,12139,12141,12143,12187,12191,12197,12202,12206,12209,12212,12217,12219

Modified: branches/8.2.0/nanobsd/Files/etc/rc.d/ix-ldap
===================================================================
--- branches/8.2.0/nanobsd/Files/etc/rc.d/ix-ldap	2012-08-29 19:30:19 UTC (rev 12219)
+++ branches/8.2.0/nanobsd/Files/etc/rc.d/ix-ldap	2012-08-29 19:33:43 UTC (rev 12220)
@@ -217,7 +217,7 @@
 	while eval read ldap_anonbind ldap_rootbasedn ldap_rootbindpw ldap_ssl
 	do
 		local res=1
-		local ldapwhoami=/usr/local/bin/ldapwhoami
+		local ldapsearch=/usr/local/bin/ldapsearch
 		local options=
 
 		if [ "${ldap_ssl}" = "start_tls" ]
@@ -234,29 +234,25 @@
 			chmod 400 "${temp}"
 			echo -n "${ldap_rootbindpw}" > "${temp}"
 
-			echo ${ldapwhoami} ${options} -D "'${ldap_rootbasedn}'" -y "${temp}" > "${cmdfile}"
+			echo "${ldapsearch} ${options} -D "'${ldap_rootbasedn}'" -y "${temp}"" > "${cmdfile}"
 			cmd=$(cat ${cmdfile})
-			out=$(eval ${cmd})
+			eval "${cmd}" >/dev/null 2>&1
 			res=$?
 
 			rm -f "${temp}" "${cmdfile}"
-			local dn=$(echo "${out}"|cut -f2 -d:)
-			if [ "${dn}" != "${ldap_rootbasedn}" ]
-			then
-				res=1
-			fi
 		else		
-			local out=$(${ldapwhoami} -D '' ${options})
+			local cmdfile=$(mktemp /tmp/tmp.XXXXXX)
+			local cmd
+
+			echo "${ldapsearch} -D '' ${options}" > "${cmdfile}"
+			cmd=$(cat ${cmdfile})
+			eval "${cmd}" >/dev/null 2>&1
 			res=$?
 
-			local dn=$(echo "${out}"|cut -f2 -d:)
-			if [ "${dn}" != "anonymous" ]
-			then
-				res=1
-			fi
+			rm -f "${cmdfile}"
 		fi
 
-		if [ "${res}" = "1" ]
+		if [ "${res}" != "0" ]
 		then
 			touch "${fail}"
 		fi

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12226
          http://freenas.svn.sourceforge.net/freenas/?rev=12226&view=rev
Author:   jhixson
Date:     2012-08-30 01:59:00 +0000 (Thu, 30 Aug 2012)
Log Message:
-----------
MFC 12225 - Make AD do the right thing(tm)

Modified Paths:
--------------
    branches/8.2.0/gui/middleware/notifier.py
    branches/8.2.0/gui/services/views.py

Property Changed:
----------------
    branches/8.2.0/


Property changes on: branches/8.2.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137,12139,12141,12143,12187,12191,12197,12202,12206,12209,12212,12217,12219
   + /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137,12139,12141,12143,12187,12191,12197,12202,12206,12209,12212,12217,12219,12225

Modified: branches/8.2.0/gui/middleware/notifier.py
===================================================================
--- branches/8.2.0/gui/middleware/notifier.py	2012-08-30 01:57:34 UTC (rev 12225)
+++ branches/8.2.0/gui/middleware/notifier.py	2012-08-30 01:59:00 UTC (rev 12226)
@@ -531,35 +531,96 @@
         return ret
 
     def _start_activedirectory(self):
+        from freenasUI.services import models
+
+        cifs_file = "/tmp/.cifs"
+        cifs_svc_entry = models.services.objects.get(srv_service='cifs')
+        cifs_started = cifs_svc_entry.srv_enable
+
+        if not cifs_started:
+            cifs_svc_entry.srv_enable = 1
+            cifs_svc_entry.save()
+
         self.__system("/usr/sbin/service ix-kerberos quietstart")
         self.__system("/usr/sbin/service ix-nsswitch quietstart")
         self.__system("/usr/sbin/service ix-pam quietstart")
         self.__system("/usr/sbin/service ix-samba quietstart")
         self.__system("/usr/sbin/service ix-kinit quietstart")
         if self.__system_nolog('/usr/sbin/service ix-kinit status') != 0:
-            # XXX: Exceptions don't work here on all versions, e.g. 8.0.2.
-            #raise Exception('Failed to get a kerberos ticket.')
             return False
         if self.__system_nolog("/usr/sbin/service ix-activedirectory quietstart") != 0:
             return False
-        if (self.__system_nolog('/usr/sbin/service ix-activedirectory status')
-            != 0):
-            # XXX: Exceptions don't work here on all versions, e.g. 8.0.2.
-            #raise Exception('Failed to associate with the domain.')
+        if (self.__system_nolog('/usr/sbin/service ix-activedirectory status') != 0):
             return False
         self.___system("(/usr/sbin/service ix-cache quietstart) &")
-        self.__system("/usr/sbin/service winbindd quietstart")
+
+        try:
+            f = open(cifs_file, "w+")
+            f.write("%d" % "1" if cifs_started else "0")
+            f.close()
+
+        except:
+            pass
+
+        if cifs_started:
+            self.__system("/usr/sbin/service samba restart")
+        else:
+            self.__system("/usr/sbin/service samba start")
+
         return True
 
     def _stop_activedirectory(self):
+        from freenasUI.services import models
+
+        cifs_file = "/tmp/.cifs"
+        cifs_svc_entry = models.services.objects.get(srv_service='cifs')
+        cifs_started = cifs_svc_entry.srv_enable
+
+        ad_svc_entry = models.services.objects.get(srv_service='activedirectory')
+        ad_started = ad_svc_entry.srv_enable
+
         self.__system("/usr/sbin/service ix-kerberos quietstart")
         self.__system("/usr/sbin/service ix-nsswitch quietstart")
         self.__system("/usr/sbin/service ix-pam quietstart")
+
+        if ad_started:
+            ad_svc_entry.srv_enable = 0
+            ad_svc_entry.save()
+
         self.__system("/usr/sbin/service ix-samba quietstart")
+
+        if ad_started:
+            ad_svc_entry.srv_enable = 1
+            ad_svc_entry.save()
+
         self.__system("/usr/sbin/service ix-kinit forcestop")
         self.__system("/usr/sbin/service ix-activedirectory forcestop")
         self.___system("(/usr/sbin/service ix-cache quietstop) &")
-        self.__system("/usr/sbin/service winbindd forcestop")
+
+        try:
+            f = open(cifs_file, "r")
+            prev_cifs_started = int(f.readline())
+            f.close()
+
+        except:
+            prev_cifs_started = cifs_started
+
+        if cifs_started and prev_cifs_started:
+            self.__system("/usr/sbin/service samba restart")
+
+        elif cifs_started and not prev_cifs_started:
+            self.__system("/usr/sbin/service samba stop")
+            cifs_svc_entry.srv_enable = 0
+            cifs_svc_entry.save()
+
+        elif not cifs_started and prev_cifs_started:
+            cifs_svc_entry.srv_enable = 1
+            cifs_svc_entry.save()
+            self.__system("/usr/sbin/service samba start")
+
+        elif not cifs_started and not prev_cifs_started:
+            self.__system("/usr/sbin/service samba stop")
+
         return False
 
     def _restart_activedirectory(self):

Modified: branches/8.2.0/gui/services/views.py
===================================================================
--- branches/8.2.0/gui/services/views.py	2012-08-30 01:57:34 UTC (rev 12225)
+++ branches/8.2.0/gui/services/views.py	2012-08-30 01:59:00 UTC (rev 12226)
@@ -304,8 +304,10 @@
                 not opp_svc_entry.srv_enable == 1 or
                 not opposing_service):
             svc_entry.srv_enable = 1
-    svc_entry.save()
 
+    if changing_service != 'activedirectory':
+        svc_entry.save()
+
     #
     # forcestop then start to make sure the service is of the same status.
     #
@@ -322,12 +324,14 @@
 
     elif changing_service == "activedirectory":
         if svc_entry.srv_enable == 1:
+            svc_entry.save()
             started = notifier()._start_activedirectory()
         else:
             started = notifier()._stop_activedirectory()
+            svc_entry.save()
 
     elif changing_service == "plugins":
-        if svc_entry.srv_enable == 1:
+        if ssc_entry.srv_enable == 1:
             started = notifier().start("plugins_jail")
         else:
             started = notifier().stop("plugins_jail")

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12228
          http://freenas.svn.sourceforge.net/freenas/?rev=12228&view=rev
Author:   jhixson
Date:     2012-08-30 02:22:34 +0000 (Thu, 30 Aug 2012)
Log Message:
-----------
MFC 12227 - Make LDAP do the right thing(tm)

Modified Paths:
--------------
    branches/8.2.0/gui/middleware/notifier.py

Property Changed:
----------------
    branches/8.2.0/


Property changes on: branches/8.2.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137,12139,12141,12143,12187,12191,12197,12202,12206,12209,12212,12217,12219,12225
   + /branches/8.0.1:7333,7346
/branches/8.1:6033-6383
/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
/branches/8.2.0-new-upgrade-path:10601
/branches/bs:11368-11369,11377
/branches/build_system:11262,11293-11294
/branches/dev-8.3:10721
/branches/dojo17:8468-8495
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:11092-11093,11265,11279,11295,11330,11335,11381,11385,11388,11491,11495,11501-11502,11540,11542,11554,11562-11563,11603,11605,11607,11609,11621,11623,11626,11634,11639,11655-11657,11659,11661,11663,11665,11667-11668,11672,11683,11687,11690,11819,11917,11929,11947,12023,12072,12085,12087-12093,12113-12116,12131,12137,12139,12141,12143,12187,12191,12197,12202,12206,12209,12212,12217,12219,12225,12227

Modified: branches/8.2.0/gui/middleware/notifier.py
===================================================================
--- branches/8.2.0/gui/middleware/notifier.py	2012-08-30 02:21:21 UTC (rev 12227)
+++ branches/8.2.0/gui/middleware/notifier.py	2012-08-30 02:22:34 UTC (rev 12228)
@@ -459,18 +459,35 @@
         self.__system("/usr/sbin/service rsyncd restart")
 
     def _start_ldap(self):
+        from freenasUI.services import models
+
+        cifs_file = "/tmp/.cifs_LDAP"
+        cifs_svc_entry = models.services.objects.get(srv_service='cifs')
+        cifs_started = cifs_svc_entry.srv_enable
+
+        if not cifs_started:
+            cifs_svc_entry.srv_enable = 1
+            cifs_svc_entry.save()
+
         self.__system("/usr/sbin/service ix-ldap quietstart")
         self.___system("(/usr/sbin/service ix-cache quietstart) &")
         self.__system("/usr/sbin/service ix-nsswitch quietstart")
         self.__system("/usr/sbin/service ix-pam quietstart")
         self.__system("/usr/sbin/service ix-samba quietstart")
-        self.__system("/usr/sbin/service samba forcestop")
-        self.__system("/usr/bin/killall nmbd")
-        self.__system("/usr/bin/killall smbd")
-        self.__system("/usr/bin/killall winbindd")
-        self.__system("/bin/sleep 5")
-        self.__system("/usr/sbin/service samba quietstart")
 
+        try:   
+            f = open(cifs_file, "w+")
+            f.write("%d" % "1" if cifs_started else "0")
+            f.close()
+
+        except:
+            pass
+
+        if cifs_started:
+            self.__system("/usr/sbin/service samba restart")
+        else:
+            self.__system("/usr/sbin/service samba start")
+
         if (self.__system_nolog('/usr/sbin/service ix-ldap status') != 0):
             return False
 
@@ -492,17 +509,55 @@
         return ret
 
     def _stop_ldap(self):
+        from freenasUI.services import models
+
+        cifs_file = "/tmp/.cifs_LDAP"
+        cifs_svc_entry = models.services.objects.get(srv_service='cifs')
+        cifs_started = cifs_svc_entry.srv_enable
+
+        ldap_svc_entry = models.services.objects.get(srv_service='ldap')
+        ldap_started = ldap_svc_entry.srv_enable
+
         self.__system("/usr/sbin/service ix-ldap quietstart")
         self.___system("(/usr/sbin/service ix-cache quietstop) &")
         self.__system("/usr/sbin/service ix-nsswitch quietstart")
         self.__system("/usr/sbin/service ix-pam quietstart")
+
+        if ldap_started:
+            ldap_svc_entry.srv_enable = 0
+            ldap_svc_entry.save()
+
         self.__system("/usr/sbin/service ix-samba quietstart")
-        self.__system("/usr/sbin/service samba forcestop")
-        self.__system("/usr/bin/killall nmbd")
-        self.__system("/usr/bin/killall smbd")
-        self.__system("/usr/bin/killall winbindd")
-        self.__system("/bin/sleep 5")
-        self.__system("/usr/sbin/service samba quietstart")
+
+        if ldap_started:
+            ldap_svc_entry.srv_enable = 1
+            ldap_svc_entry.save()
+
+        try:
+            f = open(cifs_file, "r")
+            prev_cifs_started = int(f.readline())
+            f.close()
+            os.unlink(cifs_file)
+
+        except:
+            prev_cifs_started = cifs_started
+
+        if cifs_started and prev_cifs_started:
+            self.__system("/usr/sbin/service samba restart")
+
+        elif cifs_started and not prev_cifs_started:
+            self.__system("/usr/sbin/service samba forcestop")
+            cifs_svc_entry.srv_enable = 0
+            cifs_svc_entry.save()
+
+        elif not cifs_started and prev_cifs_started:
+            cifs_svc_entry.srv_enable = 1
+            cifs_svc_entry.save()
+            self.__system("/usr/sbin/service samba start")
+
+        elif not cifs_started and not prev_cifs_started:
+            self.__system("/usr/sbin/service samba forcestop")
+
         return False
 
     def _restart_ldap(self):
@@ -533,7 +588,7 @@
     def _start_activedirectory(self):
         from freenasUI.services import models
 
-        cifs_file = "/tmp/.cifs"
+        cifs_file = "/tmp/.cifs_AD"
         cifs_svc_entry = models.services.objects.get(srv_service='cifs')
         cifs_started = cifs_svc_entry.srv_enable
 
@@ -572,7 +627,7 @@
     def _stop_activedirectory(self):
         from freenasUI.services import models
 
-        cifs_file = "/tmp/.cifs"
+        cifs_file = "/tmp/.cifs_AD"
         cifs_svc_entry = models.services.objects.get(srv_service='cifs')
         cifs_started = cifs_svc_entry.srv_enable
 
@@ -601,6 +656,7 @@
             f = open(cifs_file, "r")
             prev_cifs_started = int(f.readline())
             f.close()
+            os.unlink(cifs_file)
 
         except:
             prev_cifs_started = cifs_started
@@ -609,7 +665,7 @@
             self.__system("/usr/sbin/service samba restart")
 
         elif cifs_started and not prev_cifs_started:
-            self.__system("/usr/sbin/service samba stop")
+            self.__system("/usr/sbin/service samba focestop")
             cifs_svc_entry.srv_enable = 0
             cifs_svc_entry.save()
 
@@ -619,7 +675,7 @@
             self.__system("/usr/sbin/service samba start")
 
         elif not cifs_started and not prev_cifs_started:
-            self.__system("/usr/sbin/service samba stop")
+            self.__system("/usr/sbin/service samba forcestop")
 
         return False
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.